From 9cb33ace7d908b45620d2a1d508b87cd742be302 Mon Sep 17 00:00:00 2001 From: caro Date: Thu, 26 Feb 2009 07:46:57 +0000 Subject: [PATCH] fix some llvm reports git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@39241 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_evas/ecore_evas_win32.c | 102 +++++++++++++++++++++++----------- src/lib/ecore_evas/ecore_evas_wince.c | 72 +++++++++--------------- 2 files changed, 96 insertions(+), 78 deletions(-) diff --git a/src/lib/ecore_evas/ecore_evas_win32.c b/src/lib/ecore_evas/ecore_evas_win32.c index 0cf836d..a4bd1a3 100644 --- a/src/lib/ecore_evas/ecore_evas_win32.c +++ b/src/lib/ecore_evas/ecore_evas_win32.c @@ -1269,8 +1269,11 @@ _ecore_evas_win32_new_internal(int (*_ecore_evas_engine_init)(Ecore_Evas *ee), return ee; } + #endif /* BUILD_ECORE_EVAS_WIN32 */ +#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW + EAPI Ecore_Evas * ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent, int x, @@ -1278,23 +1281,31 @@ ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent, int width, int height) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_ddraw_init, parent, x, y, width, height); +} + #else + +EAPI Ecore_Evas * +ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__) +{ return NULL; - parent = NULL; - x = 0; - y = 0; - width = 0; - height = 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ } +#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ + + +#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DIRECTDRAW + EAPI Ecore_Evas * ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent, int x, @@ -1302,23 +1313,31 @@ ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent, int width, int height) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DIRECTDRAW return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_16_ddraw_init, parent, x, y, width, height); +} + #else + +EAPI Ecore_Evas * +ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__) +{ return NULL; - parent = NULL; - x = 0; - y = 0; - width = 0; - height = 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_DIRECTDRAW */ } +#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_DIRECTDRAW */ + + +#ifdef BUILD_ECORE_EVAS_DIRECT3D + EAPI Ecore_Evas * ecore_evas_direct3d_new(Ecore_Win32_Window *parent, int x, @@ -1326,23 +1345,31 @@ ecore_evas_direct3d_new(Ecore_Win32_Window *parent, int width, int height) { -#ifdef BUILD_ECORE_EVAS_DIRECT3D return _ecore_evas_win32_new_internal(_ecore_evas_engine_direct3d_init, parent, x, y, width, height); +} + #else + +EAPI Ecore_Evas * +ecore_evas_direct3d_new(Ecore_Win32_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__) +{ return NULL; - parent = NULL; - x = 0; - y = 0; - width = 0; - height = 0; -#endif /* ! BUILD_ECORE_EVAS_DIRECT3D */ } +#endif /* ! BUILD_ECORE_EVAS_DIRECT3D */ + + +#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW + EAPI Ecore_Evas * ecore_evas_gl_glew_new(Ecore_Win32_Window *parent, int x, @@ -1350,30 +1377,43 @@ ecore_evas_gl_glew_new(Ecore_Win32_Window *parent, int width, int height) { -#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW return _ecore_evas_win32_new_internal(_ecore_evas_engine_opengl_glew_init, parent, x, y, width, height); +} + #else + +EAPI Ecore_Evas * +ecore_evas_gl_glew_new(Ecore_Win32_Window *parent, + int x, + int y, + int width, + int height) +{ return NULL; - parent = NULL; - x = 0; - y = 0; - width = 0; - height = 0; -#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */ } +#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */ + + +#ifdef BUILD_ECORE_EVAS_WIN32 + EAPI Ecore_Win32_Window * ecore_evas_win32_window_get(const Ecore_Evas *ee) { -#ifdef BUILD_ECORE_EVAS_WIN32 return (Ecore_Win32_Window *) _ecore_evas_win32_window_get(ee); +} + #else + +EAPI Ecore_Win32_Window * +ecore_evas_win32_window_get(const Ecore_Evas *ee) +{ return NULL; - ee = NULL; -#endif /* BUILD_ECORE_EVAS_WIN32 */ } + +#endif /* BUILD_ECORE_EVAS_WIN32 */ diff --git a/src/lib/ecore_evas/ecore_evas_wince.c b/src/lib/ecore_evas/ecore_evas_wince.c index 7013af8..dd39027 100644 --- a/src/lib/ecore_evas/ecore_evas_wince.c +++ b/src/lib/ecore_evas/ecore_evas_wince.c @@ -1055,6 +1055,21 @@ ecore_evas_software_wince_new_internal(int backend, return ee; } + +#else + +static Ecore_Evas * +ecore_evas_software_wince_new_internal(int backend __UNUSED__, + Ecore_WinCE_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__, + int fullscreen __UNUSED__) +{ + return NULL; +} + #endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ @@ -1065,16 +1080,7 @@ ecore_evas_software_wince_new(Ecore_WinCE_Window *parent, int width, int height) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE return ecore_evas_software_wince_new_internal(0, parent, x, y, width, height, 1); -#else - return NULL; - parent = NULL; - x = 0; - y = 0; - width = 0; - height = 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ } EAPI Ecore_Evas * @@ -1084,16 +1090,7 @@ ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent, int width, int height) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE return ecore_evas_software_wince_new_internal(1, parent, x, y, width, height, 1); -#else - return NULL; - parent = NULL; - x = 0; - y = 0; - width = 0; - height = 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ } EAPI Ecore_Evas * @@ -1103,16 +1100,7 @@ ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent, int width, int height) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE return ecore_evas_software_wince_new_internal(2, parent, x, y, width, height, 1); -#else - return NULL; - parent = NULL; - x = 0; - y = 0; - width = 0; - height = 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ } EAPI Ecore_Evas * @@ -1122,16 +1110,7 @@ ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent, int width, int height) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE return ecore_evas_software_wince_new_internal(3, parent, x, y, width, height, 1); -#else - return NULL; - parent = NULL; - x = 0; - y = 0; - width = 0; - height = 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ } EAPI Ecore_Evas * @@ -1141,24 +1120,23 @@ ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent, int width, int height) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE return ecore_evas_software_wince_new_internal(4, parent, x, y, width, height, 0); -#else - return NULL; - parent = NULL; - x = 0; - y = 0; - width = 0; - height = 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ } +#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE + EAPI Ecore_WinCE_Window * ecore_evas_software_wince_window_get(const Ecore_Evas *ee) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE return (Ecore_WinCE_Window *) _ecore_evas_wince_window_get(ee); +} + #else + +EAPI Ecore_WinCE_Window * +ecore_evas_software_wince_window_get(const Ecore_Evas *ee __UNUSED__) +{ return NULL; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ } + +#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ -- 2.7.4