From 5fbecabb436c14fa7129dedd013034bc31817d07 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 15 May 2012 13:21:01 +0000 Subject: [PATCH] Evas (wayland_egl): Fix compiler warnings. Use proper log_domain name. Fix static build of the engine. Define the proper module name. SVN revision: 71116 --- .../evas/src/modules/engines/wayland_egl/evas_engine.c | 10 +++++----- .../src/modules/engines/wayland_egl/evas_wl_main.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c b/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c index cc7e2f33ce..e2a02da5be 100644 --- a/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c +++ b/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c @@ -1911,7 +1911,7 @@ eng_image_stride_get(void *data __UNUSED__, void *image, int *stride) } static void -eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props) +eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font __UNUSED__, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props) { Render_Engine *re; @@ -2900,7 +2900,7 @@ module_open(Evas_Module *em) if (_evas_engine_wl_egl_log_dom < 0) { _evas_engine_wl_egl_log_dom = - eina_log_domain_register("evas-gl_x11", EVAS_DEFAULT_LOG_COLOR); + eina_log_domain_register("evas-wayland_egl", EVAS_DEFAULT_LOG_COLOR); } if (_evas_engine_wl_egl_log_dom < 0) @@ -3022,10 +3022,10 @@ static Evas_Module_Api evas_modapi = EVAS_MODULE_API_VERSION, "wayland_egl", "none", {module_open, module_close} }; -EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, gl_x11); +EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, wayland_egl); -#ifndef EVAS_STATIC_BUILD_GL_XLIB -EVAS_EINA_MODULE_DEFINE(engine, gl_x11); +#ifndef EVAS_STATIC_BUILD_WAYLAND_EGL +EVAS_EINA_MODULE_DEFINE(engine, wayland_egl); #endif /* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ diff --git a/legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c b/legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c index 60a2371a89..58ab1c3abb 100644 --- a/legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c +++ b/legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c @@ -144,8 +144,8 @@ eng_window_new(struct wl_display *disp, struct wl_surface *surface, int screen, NULL); if (gw->egl_surface[0] == EGL_NO_SURFACE) { - ERR("eglCreateWindowSurface() fail for %#x. code=%#x", - (unsigned int)gw->win, eglGetError()); + ERR("eglCreateWindowSurface() fail for %p. code=%#x", + gw->win, eglGetError()); eng_window_free(gw); return NULL; } @@ -297,8 +297,8 @@ eng_window_resurf(Evas_GL_Wl_Window *gw) if (gw->egl_surface[0] == EGL_NO_SURFACE) { - ERR("eglCreateWindowSurface() fail for %#x. code=%#x", - (unsigned int)gw->win, eglGetError()); + ERR("eglCreateWindowSurface() fail for %p. code=%#x", + gw->win, eglGetError()); return; } if (eglMakeCurrent(gw->egl_disp, gw->egl_surface[0], gw->egl_surface[0],