summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-05-20 08:46:02 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-20 08:46:02 -0400
commit24e4881efbaef7b4d8a94b2e79ce99e259381213 (patch)
tree9b7c4449891e515e3e543b3fc5153924e16556ce
parent41866a885577a189c3056850e7aeef3e72b4c50f (diff)
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
-rw-r--r--src/lib/evas/cache/evas_cache_image.c4
-rw-r--r--src/lib/evas/cache/evas_preload.c3
-rw-r--r--src/lib/evas/canvas/evas_async_events.c3
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c2
-rw-r--r--src/lib/evas/canvas/evas_main.c4
-rw-r--r--src/lib/evas/common/evas_image_scalecache.c4
-rw-r--r--src/lib/evas/common/language/evas_language_utils.c4
-rw-r--r--src/lib/evas/file/evas_path.c2
-rw-r--r--src/lib/evas/include/evas_common_private.h4
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c4
-rw-r--r--src/modules/evas/engines/software_generic/evas_native_dmabuf.c2
-rw-r--r--src/modules/evas/engines/software_generic/evas_native_tbm.c2
-rw-r--r--src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c4
-rw-r--r--src/modules/evas/image_loaders/generic/evas_image_load_generic.c4
-rw-r--r--src/modules/evas/image_loaders/ico/evas_image_load_ico.c4
-rw-r--r--src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c4
-rw-r--r--src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c4
-rw-r--r--src/modules/evas/image_loaders/png/evas_image_load_png.c4
-rw-r--r--src/modules/evas/image_loaders/psd/evas_image_load_psd.c4
-rw-r--r--src/modules/evas/image_loaders/tga/evas_image_load_tga.c4
-rw-r--r--src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c4
-rw-r--r--src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c4
-rw-r--r--src/modules/evas/image_loaders/webp/evas_image_load_webp.c4
-rw-r--r--src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c4
-rw-r--r--src/modules/evas/image_savers/png/evas_image_save_png.c4
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 adc38a8..593f801 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -8,10 +8,6 @@
8#include <sys/stat.h> 8#include <sys/stat.h>
9#include <errno.h> 9#include <errno.h>
10 10
11#ifdef _WIN32
12# include <Evil.h>
13#endif
14
15#include "evas_common_private.h" 11#include "evas_common_private.h"
16#include "evas_private.h" 12#include "evas_private.h"
17 13
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 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4#ifdef _WIN32
5# include <Evil.h>
6#endif
7#ifdef __linux__ 4#ifdef __linux__
8# include <sys/syscall.h> 5# include <sys/syscall.h>
9#endif 6#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 @@
7 7
8#ifdef _WIN32 8#ifdef _WIN32
9# include <winsock2.h> 9# include <winsock2.h>
10#endif /* ! _WIN32 */ 10# include <evil_private.h> /* fcntl */
11#endif
11 12
12#include <fcntl.h> 13#include <fcntl.h>
13 14
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index bee08dd..3d4c7b9 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#ifdef _WIN32 5#ifdef _WIN32
6# include <Evil.h> 6# include <evil_private.h> /* evil_path_is_absolute */
7#endif 7#endif
8 8
9#include <Eet.h> 9#include <Eet.h>
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 029e8ee..27f6a4a 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -10,6 +10,10 @@
10 10
11#include "eo_internal.h" 11#include "eo_internal.h"
12 12
13#ifdef _WIN32
14# include <evil_private.h> /* evil_init evil_shutdown */
15#endif
16
13#include <Ecore.h> 17#include <Ecore.h>
14 18
15#define EFL_INTERNAL_UNSTABLE 19#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 @@
3#endif 3#endif
4 4
5#ifdef _WIN32 5#ifdef _WIN32
6# include <Evil.h> 6# include <windows.h>
7#endif 7#endif
8 8
9#include <assert.h> 9#include <assert.h>
@@ -32,7 +32,7 @@ struct _ScaleitemKey
32 int src_x, src_y; 32 int src_x, src_y;
33 unsigned int src_w, src_h; 33 unsigned int src_w, src_h;
34 unsigned int dst_w, dst_h; 34 unsigned int dst_w, dst_h;
35 Eina_Bool smooth : 1; 35 Eina_Bool smooth : 1;
36}; 36};
37 37
38struct _Scaleitem 38struct _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 @@
29# define dgettext(domain, x) (x) 29# define dgettext(domain, x) (x)
30#endif 30#endif
31 31
32#ifdef _WIN32
33# include <Evil.h>
34#endif
35
36#include <Eina.h> 32#include <Eina.h>
37 33
38#include "evas_language_utils.h" 34#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 @@
17#include <sys/param.h> 17#include <sys/param.h>
18 18
19#ifdef _WIN32 19#ifdef _WIN32
20# include <Evil.h> 20# include <evil_private.h> /* evil_path_is_absolute */
21#endif 21#endif
22 22
23#include "evas_common_private.h" 23#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 53c9fef..825d83a 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -24,10 +24,6 @@
24#include <stdint.h> 24#include <stdint.h>
25#include <unistd.h> 25#include <unistd.h>
26 26
27#ifdef _WIN32
28# include <Evil.h>
29#endif
30
31#ifdef HAVE_ESCAPE 27#ifdef HAVE_ESCAPE
32# include <Escape.h> 28# include <Escape.h>
33#endif 29#endif
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 79f9a7b..6ae8224 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -14,6 +14,10 @@
14# include <dlfcn.h> /* dlopen,dlclose,etc */ 14# include <dlfcn.h> /* dlopen,dlclose,etc */
15#endif 15#endif
16 16
17#ifdef _WIN32
18# include <evil_private.h> /* dlsym */
19#endif
20
17#if defined HAVE_DLSYM 21#if defined HAVE_DLSYM
18# define EVAS_GL 1 22# define EVAS_GL 1
19# define EVAS_GL_NO_GL_H_CHECK 1 23# 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 @@
4 4
5#if defined HAVE_DLSYM && ! defined _WIN32 5#if defined HAVE_DLSYM && ! defined _WIN32
6# include <dlfcn.h> /* dlopen,dlclose,etc */ 6# include <dlfcn.h> /* dlopen,dlclose,etc */
7#elif _WIN32
8# include <evil_private.h> /* dlopen dlclose dlsym */
7#else 9#else
8# warning native_dmabuf should not get compiled if dlsym is not found on the system! 10# warning native_dmabuf should not get compiled if dlsym is not found on the system!
9#endif 11#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 696a728..2827e80 100644
--- 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 @@
4 4
5#if defined HAVE_DLSYM && ! defined _WIN32 5#if defined HAVE_DLSYM && ! defined _WIN32
6# include <dlfcn.h> /* dlopen,dlclose,etc */ 6# include <dlfcn.h> /* dlopen,dlclose,etc */
7#elif _WIN32
8# include <evil_private.h> /* dlopen dlclose dlsym */
7#else 9#else
8# warning native_tbm should not get compiled if dlsym is not found on the system! 10# warning native_tbm should not get compiled if dlsym is not found on the system!
9#endif 11#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 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#ifdef _WIN32
8# include <Evil.h>
9#endif
10
11#include <math.h> 7#include <math.h>
12 8
13#include "evas_common_private.h" 9#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 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <Evil.h>
7#endif
8
9#include "evas_common_private.h" 5#include "evas_common_private.h"
10#include "evas_private.h" 6#include "evas_private.h"
11 7
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 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#ifdef _WIN32
8# include <Evil.h>
9#endif
10
11#include "evas_common_private.h" 7#include "evas_common_private.h"
12#include "evas_private.h" 8#include "evas_private.h"
13 9
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 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#ifdef _WIN32
8# include <Evil.h>
9#endif
10
11#include <openjpeg.h> 7#include <openjpeg.h>
12 8
13#include "Evas_Loader.h" 9#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 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <Evil.h>
7#endif
8
9#include "evas_common_private.h" 5#include "evas_common_private.h"
10#include "evas_private.h" 6#include "evas_private.h"
11 7
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 2cc0f52..087c908 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 @@
6#include <png.h> 6#include <png.h>
7#include <setjmp.h> 7#include <setjmp.h>
8 8
9#ifdef _WIN32
10# include <Evil.h>
11#endif
12
13#include "evas_common_private.h" 9#include "evas_common_private.h"
14#include "evas_private.h" 10#include "evas_private.h"
15 11
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 @@
19# include <netinet/in.h> 19# include <netinet/in.h>
20#endif 20#endif
21 21
22#ifdef _WIN32
23# include <Evil.h>
24#endif
25
26#include "evas_common_private.h" 22#include "evas_common_private.h"
27#include "evas_private.h" 23#include "evas_private.h"
28 24
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 @@
6#include <sys/types.h> 6#include <sys/types.h>
7#include <fcntl.h> 7#include <fcntl.h>
8 8
9#ifdef _WIN32
10# include <Evil.h>
11#endif
12
13#include "evas_common_private.h" 9#include "evas_common_private.h"
14#include "evas_private.h" 10#include "evas_private.h"
15 11
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 @@
7#include <unistd.h> 7#include <unistd.h>
8#include <tiffio.h> 8#include <tiffio.h>
9 9
10#ifdef _WIN32
11# include <Evil.h>
12#endif
13
14#include "evas_common_private.h" 10#include "evas_common_private.h"
15#include "evas_private.h" 11#include "evas_private.h"
16 12
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 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#ifdef _WIN32
8# include <Evil.h>
9#endif
10
11#include "evas_common_private.h" 7#include "evas_common_private.h"
12#include "evas_private.h" 8#include "evas_private.h"
13 9
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 @@
6#include <string.h> 6#include <string.h>
7#include <webp/decode.h> 7#include <webp/decode.h>
8 8
9#ifdef _WIN32
10# include <Evil.h>
11#endif
12
13#include "evas_common_private.h" 9#include "evas_common_private.h"
14#include "evas_private.h" 10#include "evas_private.h"
15 11
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 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <Evil.h>
7#endif
8
9#include "evas_common_private.h" 5#include "evas_common_private.h"
10#include "evas_private.h" 6#include "evas_private.h"
11 7
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 @@
6#include <png.h> 6#include <png.h>
7#include <setjmp.h> 7#include <setjmp.h>
8 8
9#ifdef _WIN32
10# include <Evil.h>
11#endif
12
13#include "evas_common_private.h" 9#include "evas_common_private.h"
14#include "evas_private.h" 10#include "evas_private.h"
15 11