summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-05-20 09:10:00 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-20 09:10:00 -0400
commita5267d3d9c55ebcc2da3e7e05b23bc88d436f3fb (patch)
treea6432d852103ec270e11c156b5c514da5fe26e51 /src
parentc567278b5473fd42af7dd7090c4dc2979cc15558 (diff)
remove Evil.h when not necessary, include evil_private.h when necessary
Test Plan: compilation Reviewers: zmike, raster, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8925
Diffstat (limited to 'src')
-rw-r--r--src/bin/edje/edje_pick.c4
-rw-r--r--src/bin/edje/edje_player.c4
-rw-r--r--src/bin/edje/edje_watch.c3
-rw-r--r--src/bin/efreet/efreet_desktop_cache_create.c4
-rw-r--r--src/bin/efreet/efreet_icon_cache_create.c4
-rw-r--r--src/bin/efreet/efreet_mime_cache_create.c4
-rw-r--r--src/bin/efreet/efreetd_ipc.c4
-rw-r--r--src/bin/embryo/embryo_cc_sc1.c4
-rw-r--r--src/lib/ecore_evas/ecore_evas.c4
-rw-r--r--src/lib/ecore_file/ecore_file.c1
-rw-r--r--src/lib/ecore_file/ecore_file_monitor_win32.c14
-rw-r--r--src/lib/ecore_file/ecore_file_private.h4
-rw-r--r--src/lib/edje/edje_private.h5
-rw-r--r--src/lib/efreet/efreet_desktop.c3
-rw-r--r--src/lib/efreet/efreet_trash.c8
-rw-r--r--src/lib/efreet/efreet_uri.c4
-rw-r--r--src/lib/eio/eio_dir.c4
-rw-r--r--src/lib/eio/eio_monitor_win32.c2
-rw-r--r--src/lib/eio/eio_private.h4
-rw-r--r--src/lib/eio/eio_single.c5
-rw-r--r--src/lib/elementary/elm_font.c4
-rw-r--r--src/lib/elementary/elm_main.c1
-rw-r--r--src/lib/elua/elua_private.h4
-rw-r--r--src/lib/embryo/embryo_time.c2
-rw-r--r--src/lib/ephysics/ephysics_private.h4
-rw-r--r--src/lib/ethumb/ethumb.c4
26 files changed, 48 insertions, 60 deletions
diff --git a/src/bin/edje/edje_pick.c b/src/bin/edje/edje_pick.c
index 2079d92cee..3967443556 100644
--- a/src/bin/edje/edje_pick.c
+++ b/src/bin/edje/edje_pick.c
@@ -11,10 +11,6 @@
11#include <ctype.h> 11#include <ctype.h>
12#include <Ecore_Getopt.h> 12#include <Ecore_Getopt.h>
13 13
14#ifdef _WIN32
15# include <Evil.h>
16#endif
17
18#include "edje_cc.h" 14#include "edje_cc.h"
19#include "edje_private.h" 15#include "edje_private.h"
20 16
diff --git a/src/bin/edje/edje_player.c b/src/bin/edje/edje_player.c
index 34c1de1685..d3ae0c9aeb 100644
--- a/src/bin/edje/edje_player.c
+++ b/src/bin/edje/edje_player.c
@@ -10,10 +10,6 @@
10#include <fcntl.h> 10#include <fcntl.h>
11#include <ctype.h> 11#include <ctype.h>
12 12
13#ifdef _WIN32
14# include <Evil.h>
15#endif
16
17#include <Evas.h> 13#include <Evas.h>
18#include <Ecore.h> 14#include <Ecore.h>
19#include <Ecore_Getopt.h> 15#include <Ecore_Getopt.h>
diff --git a/src/bin/edje/edje_watch.c b/src/bin/edje/edje_watch.c
index 7c049a609a..785d941364 100644
--- a/src/bin/edje/edje_watch.c
+++ b/src/bin/edje/edje_watch.c
@@ -6,9 +6,6 @@
6# include <sys/wait.h> 6# include <sys/wait.h>
7#endif 7#endif
8 8
9#ifdef _WIN32
10# include <Evil.h>
11#endif
12#include <Eina.h> 9#include <Eina.h>
13#include <Ecore.h> 10#include <Ecore.h>
14#include <Eio.h> 11#include <Eio.h>
diff --git a/src/bin/efreet/efreet_desktop_cache_create.c b/src/bin/efreet/efreet_desktop_cache_create.c
index c749ffe4ee..ec7553dcc8 100644
--- a/src/bin/efreet/efreet_desktop_cache_create.c
+++ b/src/bin/efreet/efreet_desktop_cache_create.c
@@ -12,6 +12,10 @@
12 12
13#include <libgen.h> 13#include <libgen.h>
14 14
15#ifdef _WIN32
16# include <evil_private.h> /* fcntl realpath */
17#endif
18
15#include <Eina.h> 19#include <Eina.h>
16#include <Eet.h> 20#include <Eet.h>
17#include <Ecore.h> 21#include <Ecore.h>
diff --git a/src/bin/efreet/efreet_icon_cache_create.c b/src/bin/efreet/efreet_icon_cache_create.c
index 5fe2fe3ff0..9f3141b8f9 100644
--- a/src/bin/efreet/efreet_icon_cache_create.c
+++ b/src/bin/efreet/efreet_icon_cache_create.c
@@ -10,6 +10,10 @@
10#include <sys/resource.h> 10#include <sys/resource.h>
11#endif 11#endif
12 12
13#ifdef _WIN32
14# include <evil_private.h> /* fcntl */
15#endif
16
13#include <Eina.h> 17#include <Eina.h>
14#include <Eet.h> 18#include <Eet.h>
15#include <Ecore.h> 19#include <Ecore.h>
diff --git a/src/bin/efreet/efreet_mime_cache_create.c b/src/bin/efreet/efreet_mime_cache_create.c
index 68e30179ee..56fa592a2b 100644
--- a/src/bin/efreet/efreet_mime_cache_create.c
+++ b/src/bin/efreet/efreet_mime_cache_create.c
@@ -13,6 +13,10 @@
13#include <libgen.h> 13#include <libgen.h>
14#include <ctype.h> 14#include <ctype.h>
15 15
16#ifdef _WIN32
17# include <evil_private.h> /* fcntl */
18#endif
19
16#include <Eina.h> 20#include <Eina.h>
17#include <Eet.h> 21#include <Eet.h>
18#include <Ecore.h> 22#include <Ecore.h>
diff --git a/src/bin/efreet/efreetd_ipc.c b/src/bin/efreet/efreetd_ipc.c
index 533a33bc75..949569b729 100644
--- a/src/bin/efreet/efreetd_ipc.c
+++ b/src/bin/efreet/efreetd_ipc.c
@@ -2,6 +2,10 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <evil_private.h> /* setenv */
7#endif
8
5#include <Ecore.h> 9#include <Ecore.h>
6#include <Ecore_Ipc.h> 10#include <Ecore_Ipc.h>
7 11
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index 7c8283f0c9..0d88863bae 100644
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -36,10 +36,6 @@
36#include <unistd.h> 36#include <unistd.h>
37#include <sys/stat.h> 37#include <sys/stat.h>
38 38
39#ifdef _WIN32
40# include <Evil.h>
41#endif
42
43#include <Eina.h> 39#include <Eina.h>
44 40
45#include "embryo_cc_sc.h" 41#include "embryo_cc_sc.h"
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 86020876ef..3d4698f599 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -18,10 +18,6 @@
18# include <sys/mman.h> 18# include <sys/mman.h>
19#endif 19#endif
20 20
21#ifdef _WIN32
22# include <Evil.h>
23#endif
24
25#include <Ecore.h> 21#include <Ecore.h>
26#include "ecore_private.h" 22#include "ecore_private.h"
27#include <Ecore_Input.h> 23#include <Ecore_Input.h>
diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index 4780350de0..ab8b07f1ce 100644
--- a/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
@@ -10,6 +10,7 @@
10 10
11#ifdef _WIN32 11#ifdef _WIN32
12# include <direct.h> 12# include <direct.h>
13# include <evil_private.h> /* mkdir realpath */
13#endif 14#endif
14 15
15#ifdef HAVE_FEATURES_H 16#ifdef HAVE_FEATURES_H
diff --git a/src/lib/ecore_file/ecore_file_monitor_win32.c b/src/lib/ecore_file/ecore_file_monitor_win32.c
index 8a0f92dca7..59f5f88470 100644
--- a/src/lib/ecore_file/ecore_file_monitor_win32.c
+++ b/src/lib/ecore_file/ecore_file_monitor_win32.c
@@ -6,12 +6,14 @@
6# include <config.h> 6# include <config.h>
7#endif 7#endif
8 8
9# define WIN32_LEAN_AND_MEAN 9#define WIN32_LEAN_AND_MEAN
10# include <windows.h> 10#include <windows.h>
11# undef WIN32_LEAN_AND_MEAN 11#undef WIN32_LEAN_AND_MEAN
12# include <process.h> 12#include <process.h>
13 13
14# include "ecore_file_private.h" 14#include <evil_private.h> /* evil_wchar_to_char */
15
16#include "ecore_file_private.h"
15 17
16 18
17typedef struct _Ecore_File_Monitor_Win32 Ecore_File_Monitor_Win32; 19typedef struct _Ecore_File_Monitor_Win32 Ecore_File_Monitor_Win32;
@@ -191,7 +193,7 @@ _ecore_file_monitor_win32_cb(void *data, Ecore_Win32_Handler *wh EINA_UNUSED)
191 else 193 else
192 event = ECORE_FILE_EVENT_CREATED_FILE; 194 event = ECORE_FILE_EVENT_CREATED_FILE;
193 break; 195 break;
194 default: 196 default:
195 fprintf(stderr, "unknown event\n"); 197 fprintf(stderr, "unknown event\n");
196 event = ECORE_FILE_EVENT_NONE; 198 event = ECORE_FILE_EVENT_NONE;
197 break; 199 break;
diff --git a/src/lib/ecore_file/ecore_file_private.h b/src/lib/ecore_file/ecore_file_private.h
index 9a02fffd6d..01ea0a4f11 100644
--- a/src/lib/ecore_file/ecore_file_private.h
+++ b/src/lib/ecore_file/ecore_file_private.h
@@ -5,10 +5,6 @@
5# include <features.h> 5# include <features.h>
6#endif 6#endif
7 7
8#ifdef _WIN32
9# include <Evil.h>
10#endif
11
12#ifdef HAVE_ESCAPE 8#ifdef HAVE_ESCAPE
13# include <Escape.h> 9# include <Escape.h>
14#endif 10#endif
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index a92e5b1273..2455a342ab 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -1,3 +1,4 @@
1
1#ifndef _EDJE_PRIVATE_H 2#ifndef _EDJE_PRIVATE_H
2#define _EDJE_PRIVATE_H 3#define _EDJE_PRIVATE_H
3 4
@@ -35,10 +36,6 @@
35#include <lauxlib.h> 36#include <lauxlib.h>
36#include <setjmp.h> 37#include <setjmp.h>
37 38
38#ifdef _WIN32
39# include <Evil.h>
40#endif
41
42// auto_unref 39// auto_unref
43#define EFL_CANVAS_OBJECT_PROTECTED 40#define EFL_CANVAS_OBJECT_PROTECTED
44#define EFL_LAYOUT_CALC_PROTECTED 41#define EFL_LAYOUT_CALC_PROTECTED
diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index 949fd567fc..e56d06c908 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -2,8 +2,9 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5/* TODO : have to look why sockets must be init */
5#ifdef _WIN32 6#ifdef _WIN32
6# include <Evil.h> 7# include <evil_private.h> /* evil_sockets_init|shutdown */
7#endif 8#endif
8 9
9#include <Ecore_File.h> 10#include <Ecore_File.h>
diff --git a/src/lib/efreet/efreet_trash.c b/src/lib/efreet/efreet_trash.c
index 42a2acdd29..04a4a6cda4 100644
--- a/src/lib/efreet/efreet_trash.c
+++ b/src/lib/efreet/efreet_trash.c
@@ -7,6 +7,14 @@
7#include <libgen.h> 7#include <libgen.h>
8#include <errno.h> 8#include <errno.h>
9 9
10#ifdef _WIN32
11# ifndef WIN32_LEAN_AND_MEAN
12# define WIN32_LEAN_AND_MEAN
13# endif
14# include <windows.h> /* GetCurrentProcessId */
15# undef WIN32_LEAN_AND_MEAN
16#endif
17
10#include <Ecore_File.h> 18#include <Ecore_File.h>
11 19
12/* define macros and variable for using the eina logging system */ 20/* define macros and variable for using the eina logging system */
diff --git a/src/lib/efreet/efreet_uri.c b/src/lib/efreet/efreet_uri.c
index 36a090f60f..9f468ce5df 100644
--- a/src/lib/efreet/efreet_uri.c
+++ b/src/lib/efreet/efreet_uri.c
@@ -8,10 +8,6 @@
8#define _POSIX_HOST_NAME_MAX 255 8#define _POSIX_HOST_NAME_MAX 255
9#endif 9#endif
10 10
11#ifdef _WIN32
12# include <Evil.h>
13#endif
14
15/* define macros and variable for using the eina logging system */ 11/* define macros and variable for using the eina logging system */
16#define EFREET_MODULE_LOG_DOM /* no logging in this file */ 12#define EFREET_MODULE_LOG_DOM /* no logging in this file */
17 13
diff --git a/src/lib/eio/eio_dir.c b/src/lib/eio/eio_dir.c
index 68412b6f8a..22544c9df7 100644
--- a/src/lib/eio/eio_dir.c
+++ b/src/lib/eio/eio_dir.c
@@ -17,6 +17,10 @@
17 * if not, see <http://www.gnu.org/licenses/>. 17 * if not, see <http://www.gnu.org/licenses/>.
18 */ 18 */
19 19
20#ifdef _WIN32
21# include <evil_private.h> /* mkdir */
22#endif
23
20#include "eio_private.h" 24#include "eio_private.h"
21#include "Eio.h" 25#include "Eio.h"
22 26
diff --git a/src/lib/eio/eio_monitor_win32.c b/src/lib/eio/eio_monitor_win32.c
index 6755e9f531..a2c45de75c 100644
--- a/src/lib/eio/eio_monitor_win32.c
+++ b/src/lib/eio/eio_monitor_win32.c
@@ -17,6 +17,8 @@
17 * if not, see <http://www.gnu.org/licenses/>. 17 * if not, see <http://www.gnu.org/licenses/>.
18 */ 18 */
19 19
20#include <evil_private.h> /* evil_wchar_to_char evil_last_error_get */
21
20#include "eio_private.h" 22#include "eio_private.h"
21#include "Eio.h" 23#include "Eio.h"
22 24
diff --git a/src/lib/eio/eio_private.h b/src/lib/eio/eio_private.h
index a6cd4ccab5..36d784752d 100644
--- a/src/lib/eio/eio_private.h
+++ b/src/lib/eio/eio_private.h
@@ -31,10 +31,6 @@
31# include <features.h> 31# include <features.h>
32#endif 32#endif
33 33
34#ifdef _WIN32
35# include <Evil.h>
36#endif
37
38#include <Ecore.h> 34#include <Ecore.h>
39 35
40#include "Eio.h" 36#include "Eio.h"
diff --git a/src/lib/eio/eio_single.c b/src/lib/eio/eio_single.c
index fb8e8264fc..1701f1006e 100644
--- a/src/lib/eio/eio_single.c
+++ b/src/lib/eio/eio_single.c
@@ -18,6 +18,11 @@
18 * License along with this library; 18 * License along with this library;
19 * if not, see <http://www.gnu.org/licenses/>. 19 * if not, see <http://www.gnu.org/licenses/>.
20 */ 20 */
21
22#ifdef _WIN32
23# include <evil_private.h> /* mkdir */
24#endif
25
21#include "eio_private.h" 26#include "eio_private.h"
22#include "Eio.h" 27#include "Eio.h"
23 28
diff --git a/src/lib/elementary/elm_font.c b/src/lib/elementary/elm_font.c
index cffaa5a291..f5c37c28b7 100644
--- a/src/lib/elementary/elm_font.c
+++ b/src/lib/elementary/elm_font.c
@@ -2,10 +2,6 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <Evil.h>
7#endif
8
9#include <Elementary.h> 5#include <Elementary.h>
10#include "elm_priv.h" 6#include "elm_priv.h"
11 7
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 4bb77acf45..5aff10ae95 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -12,7 +12,6 @@
12 12
13#ifdef _WIN32 13#ifdef _WIN32
14# include <direct.h> /* getcwd */ 14# include <direct.h> /* getcwd */
15# include <Evil.h>
16#endif 15#endif
17 16
18#include <Emotion.h> 17#include <Emotion.h>
diff --git a/src/lib/elua/elua_private.h b/src/lib/elua/elua_private.h
index f4392f604b..6ecd7a80f0 100644
--- a/src/lib/elua/elua_private.h
+++ b/src/lib/elua/elua_private.h
@@ -20,10 +20,6 @@
20#include <Eina.h> 20#include <Eina.h>
21#include <Ecore.h> 21#include <Ecore.h>
22 22
23#ifdef _WIN32
24#include <Evil.h>
25#endif
26
27#include <lua.h> 23#include <lua.h>
28#include <lualib.h> 24#include <lualib.h>
29#include <lauxlib.h> 25#include <lauxlib.h>
diff --git a/src/lib/embryo/embryo_time.c b/src/lib/embryo/embryo_time.c
index be32be7a14..ac4a71754d 100644
--- a/src/lib/embryo/embryo_time.c
+++ b/src/lib/embryo/embryo_time.c
@@ -6,7 +6,7 @@
6#include <time.h> 6#include <time.h>
7 7
8#ifdef _WIN32 8#ifdef _WIN32
9# include <Evil.h> 9# include <evil_private.h> /* setenv unsetenv */
10#endif 10#endif
11 11
12#ifdef HAVE_EXOTIC 12#ifdef HAVE_EXOTIC
diff --git a/src/lib/ephysics/ephysics_private.h b/src/lib/ephysics/ephysics_private.h
index ded1d14011..26e3a4df13 100644
--- a/src/lib/ephysics/ephysics_private.h
+++ b/src/lib/ephysics/ephysics_private.h
@@ -1,10 +1,6 @@
1#ifndef _EPHYSICS_PRIVATE_H 1#ifndef _EPHYSICS_PRIVATE_H
2#define _EPHYSICS_PRIVATE_H 2#define _EPHYSICS_PRIVATE_H
3 3
4#ifdef _WIN32
5# include <Evil.h>
6#endif
7
8#pragma GCC diagnostic push 4#pragma GCC diagnostic push
9#pragma GCC system_header 5#pragma GCC system_header
10 6
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index e3afb74bc9..bbfe3a01c5 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -51,10 +51,6 @@
51# define PATH_MAX 4096 51# define PATH_MAX 4096
52#endif 52#endif
53 53
54#ifdef _WIN32
55# include <Evil.h>
56#endif
57
58#include <Eina.h> 54#include <Eina.h>
59#include <eina_safety_checks.h> 55#include <eina_safety_checks.h>
60#include <Evas.h> 56#include <Evas.h>