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

@@ -8,10 +8,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/lib/evas/cache/evas_preload.c

@@ -1,9 +1,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 #ifdef __linux__
 # include <sys/syscall.h>
 #endif

src/lib/evas/canvas/evas_async_events.c

@@ -7,7 +7,8 @@
 
 #ifdef _WIN32
 # include <winsock2.h>
-#endif /* ! _WIN32 */
+# include <evil_private.h> /* fcntl */
+#endif
 
 #include <fcntl.h>
 

src/lib/evas/canvas/evas_font_dir.c

@@ -3,7 +3,7 @@
 #endif
 
 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* evil_path_is_absolute */
 #endif
 
 #include <Eet.h>

src/lib/evas/canvas/evas_main.c

@@ -10,6 +10,10 @@
 
 #include "eo_internal.h"
 
+#ifdef _WIN32
+# include <evil_private.h> /* evil_init evil_shutdown */
+#endif
+
 #include <Ecore.h>
 
 #define EFL_INTERNAL_UNSTABLE

src/lib/evas/common/evas_image_scalecache.c

@@ -3,7 +3,7 @@
 #endif
 
 #ifdef _WIN32
-# include <Evil.h>
+# include <windows.h>
 #endif
 
 #include <assert.h>
@@ -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

src/lib/evas/common/language/evas_language_utils.c

@@ -29,10 +29,6 @@
 # define dgettext(domain, x) (x)
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include <Eina.h>
 
 #include "evas_language_utils.h"

src/lib/evas/file/evas_path.c

@@ -17,7 +17,7 @@
 #include <sys/param.h>
 
 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* evil_path_is_absolute */
 #endif
 
 #include "evas_common_private.h"

src/lib/evas/include/evas_common_private.h

@@ -24,10 +24,6 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #ifdef HAVE_ESCAPE
 # include <Escape.h>
 #endif

src/modules/evas/engines/software_generic/evas_engine.c

@@ -14,6 +14,10 @@
 # include <dlfcn.h>      /* dlopen,dlclose,etc */
 #endif
 
+#ifdef _WIN32
+# include <evil_private.h> /* dlsym */
+#endif
+
 #if defined HAVE_DLSYM
 # define EVAS_GL 1
 # define EVAS_GL_NO_GL_H_CHECK 1

src/modules/evas/engines/software_generic/evas_native_dmabuf.c

@@ -4,6 +4,8 @@
 
 #if defined HAVE_DLSYM && ! defined _WIN32
 # include <dlfcn.h>      /* dlopen,dlclose,etc */
+#elif _WIN32
+# include <evil_private.h> /* dlopen dlclose dlsym */
 #else
 # warning native_dmabuf should not get compiled if dlsym is not found on the system!
 #endif

src/modules/evas/engines/software_generic/evas_native_tbm.c

@@ -4,6 +4,8 @@
 
 #if defined HAVE_DLSYM && ! defined _WIN32
 # include <dlfcn.h>      /* dlopen,dlclose,etc */
+#elif _WIN32
+# include <evil_private.h> /* dlopen dlclose dlsym */
 #else
 # warning native_tbm should not get compiled if dlsym is not found on the system!
 #endif

src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c

@@ -4,10 +4,6 @@
 
 #include <stdio.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include <math.h>
 
 #include "evas_common_private.h"

src/modules/evas/image_loaders/generic/evas_image_load_generic.c

@@ -2,10 +2,6 @@
 # include "config.h"
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_loaders/ico/evas_image_load_ico.c

@@ -4,10 +4,6 @@
 
 #include <stdio.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c

@@ -4,10 +4,6 @@
 
 #include <stdio.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include <openjpeg.h>
 
 #include "Evas_Loader.h"

src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c

@@ -2,10 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_loaders/png/evas_image_load_png.c

@@ -6,10 +6,6 @@
 #include <png.h>
 #include <setjmp.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_loaders/psd/evas_image_load_psd.c

@@ -19,10 +19,6 @@
 # include <netinet/in.h>
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_loaders/tga/evas_image_load_tga.c

@@ -6,10 +6,6 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c

@@ -7,10 +7,6 @@
 #include <unistd.h>
 #include <tiffio.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c

@@ -4,10 +4,6 @@
 
 #include <stdio.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_loaders/webp/evas_image_load_webp.c

@@ -6,10 +6,6 @@
 #include <string.h>
 #include <webp/decode.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c

@@ -2,10 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"
 

src/modules/evas/image_savers/png/evas_image_save_png.c

@@ -6,10 +6,6 @@
 #include <png.h>
 #include <setjmp.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "evas_common_private.h"
 #include "evas_private.h"