summaryrefslogtreecommitdiff
path: root/src/lib/eina
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-05-16 13:48:59 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-16 13:48:59 -0400
commitce9cad3a3b21e1048f66c275840bb9b2a02aa55d (patch)
tree5d7e0245807fc5e0b6c591b9e4c84df6bf5ae158 /src/lib/eina
parent05902c708a0c0f01eddb3d48f12dc2e5d793c165 (diff)
Eina: replace Evil.h with evil_private.h and remove Evil.h when not necessary
Test Plan: compilation Reviewers: raster, zmike, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8903
Diffstat (limited to 'src/lib/eina')
-rw-r--r--src/lib/eina/Eina.h4
-rw-r--r--src/lib/eina/eina_benchmark.c4
-rw-r--r--src/lib/eina/eina_binbuf.c4
-rw-r--r--src/lib/eina/eina_convert.c4
-rw-r--r--src/lib/eina/eina_debug.c2
-rw-r--r--src/lib/eina/eina_debug_bt.c2
-rw-r--r--src/lib/eina/eina_debug_bt_file.c2
-rw-r--r--src/lib/eina/eina_evlog.c4
-rw-r--r--src/lib/eina/eina_file_common.c2
-rw-r--r--src/lib/eina/eina_file_win32.c6
-rw-r--r--src/lib/eina/eina_inline_slice.x3
-rw-r--r--src/lib/eina/eina_list.c4
-rw-r--r--src/lib/eina/eina_log.c2
-rw-r--r--src/lib/eina/eina_magic.c4
-rw-r--r--src/lib/eina/eina_main.c4
-rw-r--r--src/lib/eina/eina_matrixsparse.c4
-rw-r--r--src/lib/eina/eina_module.c2
-rw-r--r--src/lib/eina/eina_prefix.c2
-rw-r--r--src/lib/eina/eina_private.h4
-rw-r--r--src/lib/eina/eina_quadtree.c4
-rw-r--r--src/lib/eina/eina_rectangle.c4
-rw-r--r--src/lib/eina/eina_share_common.c4
-rw-r--r--src/lib/eina/eina_simple_xml_parser.c4
-rw-r--r--src/lib/eina/eina_strbuf.c4
-rw-r--r--src/lib/eina/eina_strbuf_common.c4
-rw-r--r--src/lib/eina/eina_stringshare.c4
-rw-r--r--src/lib/eina/eina_tmpstr.c4
-rw-r--r--src/lib/eina/eina_ustrbuf.c4
-rw-r--r--src/lib/eina/eina_value.c4
-rw-r--r--src/lib/eina/eina_value_util.c2
-rw-r--r--src/lib/eina/eina_xattr.c4
31 files changed, 9 insertions, 100 deletions
diff --git a/src/lib/eina/Eina.h b/src/lib/eina/Eina.h
index b403d30..bbf3161 100644
--- a/src/lib/eina/Eina.h
+++ b/src/lib/eina/Eina.h
@@ -202,10 +202,6 @@
202 * make it safer, log errors, manage memory more efficiently and more. 202 * make it safer, log errors, manage memory more efficiently and more.
203 */ 203 */
204 204
205#ifdef _WIN32
206# include <Evil.h>
207#endif
208
209#ifdef __cplusplus 205#ifdef __cplusplus
210extern "C" { 206extern "C" {
211#endif 207#endif
diff --git a/src/lib/eina/eina_benchmark.c b/src/lib/eina/eina_benchmark.c
index db17a0f..7afa8e8 100644
--- a/src/lib/eina/eina_benchmark.c
+++ b/src/lib/eina/eina_benchmark.c
@@ -24,10 +24,6 @@
24#include <stdio.h> 24#include <stdio.h>
25#include <string.h> 25#include <string.h>
26 26
27#ifdef _WIN32
28# include <Evil.h>
29#endif
30
31#include "eina_config.h" 27#include "eina_config.h"
32#include "eina_private.h" 28#include "eina_private.h"
33#include "eina_alloca.h" 29#include "eina_alloca.h"
diff --git a/src/lib/eina/eina_binbuf.c b/src/lib/eina/eina_binbuf.c
index c8623a3..d392686c 100644
--- a/src/lib/eina/eina_binbuf.c
+++ b/src/lib/eina/eina_binbuf.c
@@ -5,10 +5,6 @@
5#include <stdio.h> 5#include <stdio.h>
6#include <string.h> 6#include <string.h>
7 7
8#ifdef _WIN32
9# include <Evil.h>
10#endif
11
12#include "eina_private.h" 8#include "eina_private.h"
13#include "eina_strbuf_common.h" 9#include "eina_strbuf_common.h"
14#include "eina_binbuf.h" 10#include "eina_binbuf.h"
diff --git a/src/lib/eina/eina_convert.c b/src/lib/eina/eina_convert.c
index bd2d3c2..915ed7d 100644
--- a/src/lib/eina/eina_convert.c
+++ b/src/lib/eina/eina_convert.c
@@ -31,10 +31,6 @@
31#include <errno.h> 31#include <errno.h>
32#include <ctype.h> 32#include <ctype.h>
33 33
34#ifdef _WIN32
35# include <Evil.h>
36#endif
37
38#include "eina_config.h" 34#include "eina_config.h"
39#include "eina_private.h" 35#include "eina_private.h"
40#include "eina_log.h" 36#include "eina_log.h"
diff --git a/src/lib/eina/eina_debug.c b/src/lib/eina/eina_debug.c
index c29e2f3..c811c5f 100644
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@@ -56,7 +56,7 @@
56 56
57#ifdef _WIN32 57#ifdef _WIN32
58# include <ws2tcpip.h> 58# include <ws2tcpip.h>
59# include <Evil.h> 59# include <evil_private.h> /* fcntl */
60#endif 60#endif
61 61
62#include "eina_alloca.h" 62#include "eina_alloca.h"
diff --git a/src/lib/eina/eina_debug_bt.c b/src/lib/eina/eina_debug_bt.c
index f38dcd4..a2510e9 100644
--- a/src/lib/eina/eina_debug_bt.c
+++ b/src/lib/eina/eina_debug_bt.c
@@ -22,7 +22,7 @@
22 22
23#ifdef HAVE_DLADDR 23#ifdef HAVE_DLADDR
24# ifdef _WIN32 24# ifdef _WIN32
25# include <Evil.h> 25# include <evil_private.h> /* dladdr */
26# else 26# else
27# include <dlfcn.h> 27# include <dlfcn.h>
28# endif 28# endif
diff --git a/src/lib/eina/eina_debug_bt_file.c b/src/lib/eina/eina_debug_bt_file.c
index 5035187..672b3fe 100644
--- a/src/lib/eina/eina_debug_bt_file.c
+++ b/src/lib/eina/eina_debug_bt_file.c
@@ -22,7 +22,7 @@
22#include <unistd.h> 22#include <unistd.h>
23 23
24#ifdef _WIN32 24#ifdef _WIN32
25#include <Evil.h> 25#include <evil_private.h> /* realpath */
26#endif 26#endif
27 27
28#include "eina_debug_private.h" 28#include "eina_debug_private.h"
diff --git a/src/lib/eina/eina_evlog.c b/src/lib/eina/eina_evlog.c
index 3e5f3c5..994a370 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -29,10 +29,6 @@
29#include "eina_evlog.h" 29#include "eina_evlog.h"
30#include "eina_debug.h" 30#include "eina_debug.h"
31 31
32#ifdef _WIN32
33# include <Evil.h>
34#endif
35
36#if defined(__APPLE__) && defined(__MACH__) 32#if defined(__APPLE__) && defined(__MACH__)
37# include <mach/mach_time.h> 33# include <mach/mach_time.h>
38#endif 34#endif
diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index c87b7d9..b62fc22 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -28,7 +28,7 @@
28#include <errno.h> 28#include <errno.h>
29 29
30#ifdef _WIN32 30#ifdef _WIN32
31# include <Evil.h> 31# include <evil_private.h> /* windows.h fcntl mkstemps mkdtemp */
32#endif 32#endif
33 33
34#define COPY_BLOCKSIZE (4 * 1024 * 1024) 34#define COPY_BLOCKSIZE (4 * 1024 * 1024)
diff --git a/src/lib/eina/eina_file_win32.c b/src/lib/eina/eina_file_win32.c
index e10a8f5..ca8e78b8 100644
--- a/src/lib/eina/eina_file_win32.c
+++ b/src/lib/eina/eina_file_win32.c
@@ -23,11 +23,7 @@
23#include <sys/types.h> 23#include <sys/types.h>
24#include <sys/stat.h> 24#include <sys/stat.h>
25 25
26#define WIN32_LEAN_AND_MEAN 26#include <evil_private.h>
27#include <windows.h>
28#undef WIN32_LEAN_AND_MEAN
29
30#include <Evil.h>
31 27
32#include "eina_config.h" 28#include "eina_config.h"
33#include "eina_private.h" 29#include "eina_private.h"
diff --git a/src/lib/eina/eina_inline_slice.x b/src/lib/eina/eina_inline_slice.x
index 5949cd7..e11a468 100644
--- a/src/lib/eina/eina_inline_slice.x
+++ b/src/lib/eina/eina_inline_slice.x
@@ -20,9 +20,6 @@
20#define _EINA_INLINE_SLICE_H 20#define _EINA_INLINE_SLICE_H
21 21
22#include <string.h> 22#include <string.h>
23#ifdef _WIN32
24# include <Evil.h>
25#endif
26 23
27static inline Eina_Slice 24static inline Eina_Slice
28eina_rw_slice_slice_get(const Eina_Rw_Slice rw_slice) 25eina_rw_slice_slice_get(const Eina_Rw_Slice rw_slice)
diff --git a/src/lib/eina/eina_list.c b/src/lib/eina/eina_list.c
index 9192b4c..a5a6ba7 100644
--- a/src/lib/eina/eina_list.c
+++ b/src/lib/eina/eina_list.c
@@ -62,10 +62,6 @@
62#include <string.h> 62#include <string.h>
63#include <time.h> 63#include <time.h>
64 64
65#ifdef _WIN32
66# include <Evil.h>
67#endif
68
69#include "eina_config.h" 65#include "eina_config.h"
70#include "eina_private.h" 66#include "eina_private.h"
71#include "eina_log.h" 67#include "eina_log.h"
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index b6c5632..357b341 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -34,7 +34,7 @@
34#endif 34#endif
35 35
36#ifdef _WIN32 36#ifdef _WIN32
37# include <Evil.h> 37# include <windows.h>
38#endif 38#endif
39 39
40#ifdef HAVE_EXECINFO_H 40#ifdef HAVE_EXECINFO_H
diff --git a/src/lib/eina/eina_magic.c b/src/lib/eina/eina_magic.c
index c191841..cb0d997 100644
--- a/src/lib/eina/eina_magic.c
+++ b/src/lib/eina/eina_magic.c
@@ -23,10 +23,6 @@
23#include <stdlib.h> 23#include <stdlib.h>
24#include <string.h> 24#include <string.h>
25 25
26#ifdef _WIN32
27# include <Evil.h>
28#endif
29
30#include "eina_config.h" 26#include "eina_config.h"
31#include "eina_private.h" 27#include "eina_private.h"
32#include "eina_log.h" 28#include "eina_log.h"
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c
index 024d1e3..b885647 100644
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@@ -40,10 +40,6 @@
40#include <mcheck.h> 40#include <mcheck.h>
41#endif 41#endif
42 42
43#ifdef _WIN32
44#include "Evil.h"
45#endif
46
47#include "eina_lock.h" 43#include "eina_lock.h"
48#include "eina_config.h" 44#include "eina_config.h"
49#include "eina_private.h" 45#include "eina_private.h"
diff --git a/src/lib/eina/eina_matrixsparse.c b/src/lib/eina/eina_matrixsparse.c
index eb85dde..9716a2c 100644
--- a/src/lib/eina/eina_matrixsparse.c
+++ b/src/lib/eina/eina_matrixsparse.c
@@ -33,10 +33,6 @@
33#include <string.h> 33#include <string.h>
34#include <assert.h> 34#include <assert.h>
35 35
36#ifdef _WIN32
37# include <Evil.h>
38#endif
39
40#include "eina_config.h" 36#include "eina_config.h"
41#include "eina_private.h" 37#include "eina_private.h"
42#include "eina_log.h" 38#include "eina_log.h"
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 58f79b5..bff6e3f 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -32,7 +32,7 @@
32#endif 32#endif
33 33
34#ifdef _WIN32 34#ifdef _WIN32
35# include <Evil.h> 35# include <evil_private.h>
36#endif 36#endif
37 37
38#ifdef HAVE_ESCAPE 38#ifdef HAVE_ESCAPE
diff --git a/src/lib/eina/eina_prefix.c b/src/lib/eina/eina_prefix.c
index aeac22f..35b8cec 100644
--- a/src/lib/eina/eina_prefix.c
+++ b/src/lib/eina/eina_prefix.c
@@ -43,7 +43,7 @@
43 43
44#ifdef _WIN32 44#ifdef _WIN32
45# include <direct.h> /* getcwd */ 45# include <direct.h> /* getcwd */
46# include <Evil.h> 46# include <evil_private.h> /* path_is_absolute realpath dladdr */
47#endif 47#endif
48 48
49#ifdef HAVE_ESCAPE 49#ifdef HAVE_ESCAPE
diff --git a/src/lib/eina/eina_private.h b/src/lib/eina/eina_private.h
index d377357..9e2954e 100644
--- a/src/lib/eina/eina_private.h
+++ b/src/lib/eina/eina_private.h
@@ -25,10 +25,6 @@
25#include <xlocale.h> 25#include <xlocale.h>
26#endif 26#endif
27 27
28#ifdef _WIN32
29# include <Evil.h>
30#endif
31
32#include "eina_magic.h" 28#include "eina_magic.h"
33#include "eina_iterator.h" 29#include "eina_iterator.h"
34#include "eina_accessor.h" 30#include "eina_accessor.h"
diff --git a/src/lib/eina/eina_quadtree.c b/src/lib/eina/eina_quadtree.c
index 1f50fd5..83778ef 100644
--- a/src/lib/eina/eina_quadtree.c
+++ b/src/lib/eina/eina_quadtree.c
@@ -30,10 +30,6 @@
30#include <stdlib.h> 30#include <stdlib.h>
31#include <stdio.h> 31#include <stdio.h>
32 32
33#ifdef _WIN32
34# include <Evil.h>
35#endif
36
37#include "eina_quadtree.h" 33#include "eina_quadtree.h"
38#include "eina_magic.h" 34#include "eina_magic.h"
39#include "eina_mempool.h" 35#include "eina_mempool.h"
diff --git a/src/lib/eina/eina_rectangle.c b/src/lib/eina/eina_rectangle.c
index c7b89b5..e8e04cd 100644
--- a/src/lib/eina/eina_rectangle.c
+++ b/src/lib/eina/eina_rectangle.c
@@ -23,10 +23,6 @@
23#include <stdio.h> 23#include <stdio.h>
24#include <stdlib.h> 24#include <stdlib.h>
25 25
26#ifdef _WIN32
27# include <Evil.h>
28#endif
29
30#include "eina_config.h" 26#include "eina_config.h"
31#include "eina_private.h" 27#include "eina_private.h"
32#include "eina_magic.h" 28#include "eina_magic.h"
diff --git a/src/lib/eina/eina_share_common.c b/src/lib/eina/eina_share_common.c
index 7dfb446..6fce317 100644
--- a/src/lib/eina/eina_share_common.c
+++ b/src/lib/eina/eina_share_common.c
@@ -63,10 +63,6 @@
63#include <string.h> 63#include <string.h>
64#include <stddef.h> 64#include <stddef.h>
65 65
66#ifdef _WIN32
67# include <Evil.h>
68#endif
69
70#include "eina_config.h" 66#include "eina_config.h"
71#include "eina_private.h" 67#include "eina_private.h"
72#include "eina_hash.h" 68#include "eina_hash.h"
diff --git a/src/lib/eina/eina_simple_xml_parser.c b/src/lib/eina/eina_simple_xml_parser.c
index 3b218da..a2548a9 100644
--- a/src/lib/eina/eina_simple_xml_parser.c
+++ b/src/lib/eina/eina_simple_xml_parser.c
@@ -26,10 +26,6 @@
26#include <string.h> 26#include <string.h>
27#include <ctype.h> 27#include <ctype.h>
28 28
29#ifdef _WIN32
30# include <Evil.h>
31#endif
32
33#include "eina_config.h" 29#include "eina_config.h"
34#include "eina_private.h" 30#include "eina_private.h"
35#include "eina_alloca.h" 31#include "eina_alloca.h"
diff --git a/src/lib/eina/eina_strbuf.c b/src/lib/eina/eina_strbuf.c
index a76e441..69d6a30 100644
--- a/src/lib/eina/eina_strbuf.c
+++ b/src/lib/eina/eina_strbuf.c
@@ -6,10 +6,6 @@
6#include <string.h> 6#include <string.h>
7#include <ctype.h> 7#include <ctype.h>
8 8
9#ifdef _WIN32
10# include <Evil.h>
11#endif
12
13#include "eina_private.h" 9#include "eina_private.h"
14#include "eina_str.h" 10#include "eina_str.h"
15#include "eina_strbuf_common.h" 11#include "eina_strbuf_common.h"
diff --git a/src/lib/eina/eina_strbuf_common.c b/src/lib/eina/eina_strbuf_common.c
index 3a18d4d..e08d4b7 100644
--- a/src/lib/eina/eina_strbuf_common.c
+++ b/src/lib/eina/eina_strbuf_common.c
@@ -6,10 +6,6 @@
6#include <stdlib.h> 6#include <stdlib.h>
7#include <string.h> 7#include <string.h>
8 8
9#ifdef _WIN32
10# include <Evil.h>
11#endif
12
13#include "eina_private.h" 9#include "eina_private.h"
14#include "eina_str.h" 10#include "eina_str.h"
15#include "eina_magic.h" 11#include "eina_magic.h"
diff --git a/src/lib/eina/eina_stringshare.c b/src/lib/eina/eina_stringshare.c
index c5ee200..efabdb2 100644
--- a/src/lib/eina/eina_stringshare.c
+++ b/src/lib/eina/eina_stringshare.c
@@ -30,10 +30,6 @@
30#include <stdio.h> 30#include <stdio.h>
31#include <string.h> 31#include <string.h>
32 32
33#ifdef _WIN32
34# include <Evil.h>
35#endif
36
37#include "eina_config.h" 33#include "eina_config.h"
38#include "eina_private.h" 34#include "eina_private.h"
39#include "eina_alloca.h" 35#include "eina_alloca.h"
diff --git a/src/lib/eina/eina_tmpstr.c b/src/lib/eina/eina_tmpstr.c
index 9dbbe7d..84dd843 100644
--- a/src/lib/eina/eina_tmpstr.c
+++ b/src/lib/eina/eina_tmpstr.c
@@ -26,10 +26,6 @@
26#include <stdio.h> 26#include <stdio.h>
27#include <string.h> 27#include <string.h>
28 28
29#ifdef _WIN32
30# include <Evil.h>
31#endif
32
33#include "eina_config.h" 29#include "eina_config.h"
34#include "eina_private.h" 30#include "eina_private.h"
35#include "eina_log.h" 31#include "eina_log.h"
diff --git a/src/lib/eina/eina_ustrbuf.c b/src/lib/eina/eina_ustrbuf.c
index 7a2a5a0..7c1c2db 100644
--- a/src/lib/eina/eina_ustrbuf.c
+++ b/src/lib/eina/eina_ustrbuf.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 "eina_strbuf_common.h" 5#include "eina_strbuf_common.h"
10#include "eina_unicode.h" 6#include "eina_unicode.h"
11#include "eina_ustrbuf.h" 7#include "eina_ustrbuf.h"
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index c75a5f1..a2f6f53 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -24,10 +24,6 @@
24#include <inttypes.h> /* PRId64 and PRIu64 */ 24#include <inttypes.h> /* PRId64 and PRIu64 */
25#include <sys/time.h> /* struct timeval */ 25#include <sys/time.h> /* struct timeval */
26 26
27#ifdef _WIN32
28# include <Evil.h>
29#endif
30
31#include "eina_config.h" 27#include "eina_config.h"
32#include "eina_private.h" 28#include "eina_private.h"
33#include "eina_alloca.h" 29#include "eina_alloca.h"
diff --git a/src/lib/eina/eina_value_util.c b/src/lib/eina/eina_value_util.c
index 3d35a47..05c7991 100644
--- a/src/lib/eina/eina_value_util.c
+++ b/src/lib/eina/eina_value_util.c
@@ -23,7 +23,7 @@
23#include <time.h> 23#include <time.h>
24 24
25#ifdef _WIN32 25#ifdef _WIN32
26# include <Evil.h> 26# include <evil_private.h> /* strptime */
27#endif 27#endif
28 28
29#include "eina_safety_checks.h" 29#include "eina_safety_checks.h"
diff --git a/src/lib/eina/eina_xattr.c b/src/lib/eina/eina_xattr.c
index a0170ca..a32ff53 100644
--- a/src/lib/eina/eina_xattr.c
+++ b/src/lib/eina/eina_xattr.c
@@ -32,10 +32,6 @@
32 32
33#include <fcntl.h> 33#include <fcntl.h>
34 34
35#ifdef _WIN32
36#include "Evil.h"
37#endif
38
39#include "eina_config.h" 35#include "eina_config.h"
40#include "eina_private.h" 36#include "eina_private.h"
41 37