From cc2e2c57be3d7a9cb8a0b54d6dd3e1e78174dd3a Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Mon, 20 May 2019 08:46:02 -0400 Subject: [PATCH] Evas: remove Evil.h when not needed and use evil_private when needed Test Plan: compilation Reviewers: zmike, raster, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8921 --- src/lib/evas/cache/evas_cache_image.c | 4 ---- src/lib/evas/cache/evas_preload.c | 3 --- src/lib/evas/canvas/evas_async_events.c | 3 ++- src/lib/evas/canvas/evas_font_dir.c | 2 +- src/lib/evas/canvas/evas_main.c | 4 ++++ src/lib/evas/common/evas_image_scalecache.c | 4 ++-- src/lib/evas/common/language/evas_language_utils.c | 4 ---- src/lib/evas/file/evas_path.c | 2 +- src/lib/evas/include/evas_common_private.h | 4 ---- src/modules/evas/engines/software_generic/evas_engine.c | 4 ++++ src/modules/evas/engines/software_generic/evas_native_dmabuf.c | 2 ++ src/modules/evas/engines/software_generic/evas_native_tbm.c | 2 ++ src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c | 4 ---- src/modules/evas/image_loaders/generic/evas_image_load_generic.c | 4 ---- src/modules/evas/image_loaders/ico/evas_image_load_ico.c | 4 ---- src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c | 4 ---- src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c | 4 ---- src/modules/evas/image_loaders/png/evas_image_load_png.c | 4 ---- src/modules/evas/image_loaders/psd/evas_image_load_psd.c | 4 ---- src/modules/evas/image_loaders/tga/evas_image_load_tga.c | 4 ---- src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c | 4 ---- src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c | 4 ---- src/modules/evas/image_loaders/webp/evas_image_load_webp.c | 4 ---- src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c | 4 ---- src/modules/evas/image_savers/png/evas_image_save_png.c | 4 ---- 25 files changed, 18 insertions(+), 72 deletions(-) diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c index 4d28ad5..615335c 100644 --- a/src/lib/evas/cache/evas_cache_image.c +++ b/src/lib/evas/cache/evas_cache_image.c @@ -8,10 +8,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/lib/evas/cache/evas_preload.c b/src/lib/evas/cache/evas_preload.c index 921b03c..b2b2e98 100644 --- a/src/lib/evas/cache/evas_preload.c +++ b/src/lib/evas/cache/evas_preload.c @@ -1,9 +1,6 @@ #ifdef HAVE_CONFIG_H # include #endif -#ifdef _WIN32 -# include -#endif #ifdef __linux__ # include #endif diff --git a/src/lib/evas/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c index c27c23b..9e19c3d 100644 --- a/src/lib/evas/canvas/evas_async_events.c +++ b/src/lib/evas/canvas/evas_async_events.c @@ -7,7 +7,8 @@ #ifdef _WIN32 # include -#endif /* ! _WIN32 */ +# include /* fcntl */ +#endif #include diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c index ae3b422..55c18dd 100644 --- a/src/lib/evas/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c @@ -3,7 +3,7 @@ #endif #ifdef _WIN32 -# include +# include /* evil_path_is_absolute */ #endif #include diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 7986dac..4d17218 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -10,6 +10,10 @@ #include "eo_internal.h" +#ifdef _WIN32 +# include /* evil_init evil_shutdown */ +#endif + #include #define EFL_INTERNAL_UNSTABLE diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c index 5bf8e89..5ca64b1 100644 --- a/src/lib/evas/common/evas_image_scalecache.c +++ b/src/lib/evas/common/evas_image_scalecache.c @@ -3,7 +3,7 @@ #endif #ifdef _WIN32 -# include +# include #endif #include @@ -32,7 +32,7 @@ struct _ScaleitemKey int src_x, src_y; unsigned int src_w, src_h; unsigned int dst_w, dst_h; - Eina_Bool smooth : 1; + Eina_Bool smooth : 1; }; struct _Scaleitem diff --git a/src/lib/evas/common/language/evas_language_utils.c b/src/lib/evas/common/language/evas_language_utils.c index 5a8e173..4862a1e 100644 --- a/src/lib/evas/common/language/evas_language_utils.c +++ b/src/lib/evas/common/language/evas_language_utils.c @@ -29,10 +29,6 @@ # define dgettext(domain, x) (x) #endif -#ifdef _WIN32 -# include -#endif - #include #include "evas_language_utils.h" diff --git a/src/lib/evas/file/evas_path.c b/src/lib/evas/file/evas_path.c index 19eabe4..ef3d439 100644 --- a/src/lib/evas/file/evas_path.c +++ b/src/lib/evas/file/evas_path.c @@ -17,7 +17,7 @@ #include #ifdef _WIN32 -# include +# include /* evil_path_is_absolute */ #endif #include "evas_common_private.h" diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h index 5e5c1a8..9616f06 100755 --- a/src/lib/evas/include/evas_common_private.h +++ b/src/lib/evas/include/evas_common_private.h @@ -24,10 +24,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #ifdef HAVE_ESCAPE # include #endif diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c index 40c0b45..fdf7d69 100755 --- a/src/modules/evas/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -14,6 +14,10 @@ # include /* dlopen,dlclose,etc */ #endif +#ifdef _WIN32 +# include /* dlsym */ +#endif + #if defined HAVE_DLSYM # define EVAS_GL 1 # define EVAS_GL_NO_GL_H_CHECK 1 diff --git a/src/modules/evas/engines/software_generic/evas_native_dmabuf.c b/src/modules/evas/engines/software_generic/evas_native_dmabuf.c index 6033c1c..c71e1b2 100644 --- a/src/modules/evas/engines/software_generic/evas_native_dmabuf.c +++ b/src/modules/evas/engines/software_generic/evas_native_dmabuf.c @@ -4,6 +4,8 @@ #if defined HAVE_DLSYM && ! defined _WIN32 # include /* dlopen,dlclose,etc */ +#elif _WIN32 +# include /* dlopen dlclose dlsym */ #else # warning native_dmabuf should not get compiled if dlsym is not found on the system! #endif diff --git a/src/modules/evas/engines/software_generic/evas_native_tbm.c b/src/modules/evas/engines/software_generic/evas_native_tbm.c index c727881..ad241a8 100755 --- a/src/modules/evas/engines/software_generic/evas_native_tbm.c +++ b/src/modules/evas/engines/software_generic/evas_native_tbm.c @@ -4,6 +4,8 @@ #if defined HAVE_DLSYM && ! defined _WIN32 # include /* dlopen,dlclose,etc */ +#elif _WIN32 +# include /* dlopen dlclose dlsym */ #else # warning native_tbm should not get compiled if dlsym is not found on the system! #endif diff --git a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c index a003a92..43dac5b 100644 --- a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c +++ b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c @@ -4,10 +4,6 @@ #include -#ifdef _WIN32 -# include -#endif - #include #include "evas_common_private.h" diff --git a/src/modules/evas/image_loaders/generic/evas_image_load_generic.c b/src/modules/evas/image_loaders/generic/evas_image_load_generic.c index 594c6b6..ec4917f 100644 --- a/src/modules/evas/image_loaders/generic/evas_image_load_generic.c +++ b/src/modules/evas/image_loaders/generic/evas_image_load_generic.c @@ -2,10 +2,6 @@ # include "config.h" #endif -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c index 53ce8e8..520ef06 100644 --- a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c +++ b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c @@ -4,10 +4,6 @@ #include -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c index 6b9e4ec..dd9af05 100644 --- a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c +++ b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c @@ -4,10 +4,6 @@ #include -#ifdef _WIN32 -# include -#endif - #include #include "Evas_Loader.h" diff --git a/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c b/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c index f70606a..b9c383c 100644 --- a/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c +++ b/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c @@ -2,10 +2,6 @@ # include #endif -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_loaders/png/evas_image_load_png.c b/src/modules/evas/image_loaders/png/evas_image_load_png.c index 6d0c1e9..529565a 100644 --- a/src/modules/evas/image_loaders/png/evas_image_load_png.c +++ b/src/modules/evas/image_loaders/png/evas_image_load_png.c @@ -6,10 +6,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c index c1306b1..d8f15b3 100644 --- a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c +++ b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c @@ -19,10 +19,6 @@ # include #endif -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c index a62c9f0..344c363 100644 --- a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c +++ b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c @@ -6,10 +6,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c index d7e564d..e07206b 100644 --- a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c +++ b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c @@ -7,10 +7,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c b/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c index 4a3ae77..af539a0 100644 --- a/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c +++ b/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c @@ -4,10 +4,6 @@ #include -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_loaders/webp/evas_image_load_webp.c b/src/modules/evas/image_loaders/webp/evas_image_load_webp.c index aa0a6ca..e3f97bb 100644 --- a/src/modules/evas/image_loaders/webp/evas_image_load_webp.c +++ b/src/modules/evas/image_loaders/webp/evas_image_load_webp.c @@ -6,10 +6,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c index 0fa150d..4bf08b5 100644 --- a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c +++ b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c @@ -2,10 +2,6 @@ # include #endif -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" diff --git a/src/modules/evas/image_savers/png/evas_image_save_png.c b/src/modules/evas/image_savers/png/evas_image_save_png.c index bd6b5c3..1aeec12 100644 --- a/src/modules/evas/image_savers/png/evas_image_save_png.c +++ b/src/modules/evas/image_savers/png/evas_image_save_png.c @@ -6,10 +6,6 @@ #include #include -#ifdef _WIN32 -# include -#endif - #include "evas_common_private.h" #include "evas_private.h" -- 2.7.4