bin/efl and ecore: include evil_private.h when appropriate

Test Plan: compilation

Reviewers: raster, zmike, cedric

Subscribers: #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8908

11 files changed, 15 insertions, 19 deletions

diff --git a/src/bin/efl/efl_debugd.c b/src/bin/efl/efl_debugd.c
index 3962aa6a80..b23db7544c 100644
--- a/src/bin/efl/efl_debugd.c
+++ b/src/bin/efl/efl_debugd.c
@@ -25,6 +25,9 @@
 #include <fcntl.h>
 #include "eina_debug_private.h"
 
+#ifdef _WIN32
+# include <evil_private.h> /* mkdir */
+#endif
 #include <Eina.h>
 #include <Ecore.h>
 #include <Ecore_Con.h>
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index ceb3021019..7aa987b271 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -24,7 +24,7 @@
 #endif
 
 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* evil_init/shutdown */
 #endif
 #include <Eina.h>
 #include <Efl.h>
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index b4810ae441..f2ec2d61c8 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -18,6 +18,7 @@
 #ifdef _WIN32
 
 # include <winsock2.h>
+# include <evil_private.h> /* pipe */
 
 # define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0)
 # define pipe_read(fd, buffer, size)  recv((fd), (char *)(buffer), size, 0)
diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c
index 006948d46c..a3d5debc71 100644
--- a/src/lib/ecore/ecore_app.c
+++ b/src/lib/ecore/ecore_app.c
@@ -5,10 +5,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "Ecore.h"
 #include "ecore_private.h"
 
diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c
index 69e80dafbf..24159c6eac 100644
--- a/src/lib/ecore/ecore_exe_win32.c
+++ b/src/lib/ecore/ecore_exe_win32.c
@@ -7,6 +7,8 @@
 #undef WIN32_LEAN_AND_MEAN
 #include <process.h>
 
+#include <evil_private.h> /* evil_last_error_get */
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 42d554cf0f..523add2af3 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -44,9 +44,8 @@
 #endif
 
 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* evil_last_error_get */
 #endif
-
 #include "Ecore.h"
 #include "ecore_private.h"
 
diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
index 92127b95d0..d352853c4b 100644
--- a/src/lib/ecore/ecore_pipe.c
+++ b/src/lib/ecore/ecore_pipe.c
@@ -26,10 +26,6 @@
 # endif
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #ifdef HAVE_ESCAPE
 # include <Escape.h>
 #endif
@@ -51,6 +47,7 @@
 
 #ifdef _WIN32
 # include <winsock2.h>
+# include <evil_private.h> /* pipe fcntl */
 # define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0)
 # define pipe_read(fd, buffer, size)  recv((fd), (char *)(buffer), size, 0)
 # define pipe_close(fd)               closesocket(fd)
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index eef9d3d930..a2c6489d3f 100644
--- a/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
@@ -8,10 +8,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "Ecore.h"
 #include "ecore_private.h"
 
diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index 303295b796..31ffa717c8 100644
--- a/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
@@ -7,10 +7,6 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #if defined(__APPLE__) && defined(__MACH__)
 # include <mach/mach_time.h>
 #endif
diff --git a/src/lib/ecore/efl_core_proc_env.c b/src/lib/ecore/efl_core_proc_env.c
index 10ad1f9845..4c02821474 100644
--- a/src/lib/ecore/efl_core_proc_env.c
+++ b/src/lib/ecore/efl_core_proc_env.c
@@ -2,6 +2,9 @@
 # include <config.h>
 #endif
 
+#ifdef _WIN32
+# include <evil_private.h> /* setenv unsetenv */
+#endif
 #include <Ecore.h>
 #ifdef HAVE_CRT_EXTERNS_H
 # include <crt_externs.h>
diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c
index c9badf716a..cff9314d1a 100644
--- a/src/lib/ecore/efl_thread.c
+++ b/src/lib/ecore/efl_thread.c
@@ -6,6 +6,9 @@
 #define EFL_IO_WRITER_PROTECTED 1
 #define EFL_IO_CLOSER_PROTECTED 1
 
+#ifdef _WIN32
+# include <evil_private.h> /* pipe fcntl */
+#endif
 #include <Ecore.h>
 
 #include "ecore_private.h"