summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-05-17 11:52:41 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-05-17 11:53:35 +0100
commit839f22870bccc85384d46b8c735fc2ff3edc7ed8 (patch)
tree988be7cb3533131b2dd5108dfe4bbc72e458da41 /src/lib/ecore
parent099eb2c315a277bda10f41709d7f936b0ae7fb20 (diff)
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
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/ecore.c2
-rw-r--r--src/lib/ecore/ecore_anim.c1
-rw-r--r--src/lib/ecore/ecore_app.c4
-rw-r--r--src/lib/ecore/ecore_exe_win32.c2
-rw-r--r--src/lib/ecore/ecore_main.c3
-rw-r--r--src/lib/ecore/ecore_pipe.c5
-rw-r--r--src/lib/ecore/ecore_thread.c4
-rw-r--r--src/lib/ecore/ecore_time.c4
-rw-r--r--src/lib/ecore/efl_core_proc_env.c3
-rw-r--r--src/lib/ecore/efl_thread.c3
10 files changed, 12 insertions, 19 deletions
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 @@
24#endif 24#endif
25 25
26#ifdef _WIN32 26#ifdef _WIN32
27# include <Evil.h> 27# include <evil_private.h> /* evil_init/shutdown */
28#endif 28#endif
29#include <Eina.h> 29#include <Eina.h>
30#include <Efl.h> 30#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 @@
18#ifdef _WIN32 18#ifdef _WIN32
19 19
20# include <winsock2.h> 20# include <winsock2.h>
21# include <evil_private.h> /* pipe */
21 22
22# define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0) 23# define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0)
23# define pipe_read(fd, buffer, size) recv((fd), (char *)(buffer), size, 0) 24# 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 @@
5#include <stdlib.h> 5#include <stdlib.h>
6#include <unistd.h> 6#include <unistd.h>
7 7
8#ifdef _WIN32
9# include <Evil.h>
10#endif
11
12#include "Ecore.h" 8#include "Ecore.h"
13#include "ecore_private.h" 9#include "ecore_private.h"
14 10
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 @@
7#undef WIN32_LEAN_AND_MEAN 7#undef WIN32_LEAN_AND_MEAN
8#include <process.h> 8#include <process.h>
9 9
10#include <evil_private.h> /* evil_last_error_get */
11
10#include "Ecore.h" 12#include "Ecore.h"
11#include "ecore_private.h" 13#include "ecore_private.h"
12 14
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 @@
44#endif 44#endif
45 45
46#ifdef _WIN32 46#ifdef _WIN32
47# include <Evil.h> 47# include <evil_private.h> /* evil_last_error_get */
48#endif 48#endif
49
50#include "Ecore.h" 49#include "Ecore.h"
51#include "ecore_private.h" 50#include "ecore_private.h"
52 51
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 @@
26# endif 26# endif
27#endif 27#endif
28 28
29#ifdef _WIN32
30# include <Evil.h>
31#endif
32
33#ifdef HAVE_ESCAPE 29#ifdef HAVE_ESCAPE
34# include <Escape.h> 30# include <Escape.h>
35#endif 31#endif
@@ -51,6 +47,7 @@
51 47
52#ifdef _WIN32 48#ifdef _WIN32
53# include <winsock2.h> 49# include <winsock2.h>
50# include <evil_private.h> /* pipe fcntl */
54# define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0) 51# define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0)
55# define pipe_read(fd, buffer, size) recv((fd), (char *)(buffer), size, 0) 52# define pipe_read(fd, buffer, size) recv((fd), (char *)(buffer), size, 0)
56# define pipe_close(fd) closesocket(fd) 53# 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 @@
8#include <sys/types.h> 8#include <sys/types.h>
9#include <unistd.h> 9#include <unistd.h>
10 10
11#ifdef _WIN32
12# include <Evil.h>
13#endif
14
15#include "Ecore.h" 11#include "Ecore.h"
16#include "ecore_private.h" 12#include "ecore_private.h"
17 13
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 @@
7#include <stdlib.h> 7#include <stdlib.h>
8#include <sys/time.h> 8#include <sys/time.h>
9 9
10#ifdef _WIN32
11# include <Evil.h>
12#endif
13
14#if defined(__APPLE__) && defined(__MACH__) 10#if defined(__APPLE__) && defined(__MACH__)
15# include <mach/mach_time.h> 11# include <mach/mach_time.h>
16#endif 12#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 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <evil_private.h> /* setenv unsetenv */
7#endif
5#include <Ecore.h> 8#include <Ecore.h>
6#ifdef HAVE_CRT_EXTERNS_H 9#ifdef HAVE_CRT_EXTERNS_H
7# include <crt_externs.h> 10# 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 @@
6#define EFL_IO_WRITER_PROTECTED 1 6#define EFL_IO_WRITER_PROTECTED 1
7#define EFL_IO_CLOSER_PROTECTED 1 7#define EFL_IO_CLOSER_PROTECTED 1
8 8
9#ifdef _WIN32
10# include <evil_private.h> /* pipe fcntl */
11#endif
9#include <Ecore.h> 12#include <Ecore.h>
10 13
11#include "ecore_private.h" 14#include "ecore_private.h"