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
2019-05-16 13:48:59 -04:00 · 2019-05-16 13:48:59 -04:00 · ce9cad3a3b
parent 05902c708a
commit ce9cad3a3b
31 changed files with 9 additions and 100 deletions
--- a/src/lib/eina/Eina.h
+++ b/src/lib/eina/Eina.h
@ -202,10 +202,6 @@
 *        make it safer, log errors, manage memory more efficiently and more.
 */

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/src/lib/eina/eina_benchmark.c
+++ b/src/lib/eina/eina_benchmark.c
@ -24,10 +24,6 @@
 #include <stdio.h>
 #include <string.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_alloca.h"
--- a/src/lib/eina/eina_binbuf.c
+++ b/src/lib/eina/eina_binbuf.c
@ -5,10 +5,6 @@
 #include <stdio.h>
 #include <string.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_private.h"
 #include "eina_strbuf_common.h"
 #include "eina_binbuf.h"
--- a/src/lib/eina/eina_convert.c
+++ b/src/lib/eina/eina_convert.c
@ -31,10 +31,6 @@
 #include <errno.h>
 #include <ctype.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_log.h"
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@ -56,7 +56,7 @@

 #ifdef _WIN32
 # include <ws2tcpip.h>
-# include <Evil.h>
+# include <evil_private.h> /* fcntl */
 #endif

 #include "eina_alloca.h"
--- a/src/lib/eina/eina_debug_bt.c
+++ b/src/lib/eina/eina_debug_bt.c
@ -22,7 +22,7 @@

 #ifdef HAVE_DLADDR
 # ifdef _WIN32
-#  include <Evil.h>
+#  include <evil_private.h> /* dladdr */
 # else
 #  include <dlfcn.h>
 # endif
--- a/src/lib/eina/eina_debug_bt_file.c
+++ b/src/lib/eina/eina_debug_bt_file.c
@ -22,7 +22,7 @@
 #include <unistd.h>

 #ifdef _WIN32
-#include <Evil.h>
+#include <evil_private.h> /* realpath */
 #endif

 #include "eina_debug_private.h"
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@ -29,10 +29,6 @@
 #include "eina_evlog.h"
 #include "eina_debug.h"

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #if defined(__APPLE__) && defined(__MACH__)
 # include <mach/mach_time.h>
 #endif
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@ -28,7 +28,7 @@
 #include <errno.h>

 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* windows.h fcntl mkstemps mkdtemp */
 #endif

 #define COPY_BLOCKSIZE (4 * 1024 * 1024)
--- a/src/lib/eina/eina_file_win32.c
+++ b/src/lib/eina/eina_file_win32.c
@ -23,11 +23,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#include <Evil.h>
+#include <evil_private.h>

 #include "eina_config.h"
 #include "eina_private.h"
--- a/src/lib/eina/eina_inline_slice.x
+++ b/src/lib/eina/eina_inline_slice.x
@ -20,9 +20,6 @@
 #define _EINA_INLINE_SLICE_H

 #include <string.h>
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 static inline Eina_Slice
 eina_rw_slice_slice_get(const Eina_Rw_Slice rw_slice)
--- a/src/lib/eina/eina_list.c
+++ b/src/lib/eina/eina_list.c
@ -62,10 +62,6 @@
 #include <string.h>
 #include <time.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_log.h"
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@ -34,7 +34,7 @@
 #endif

 #ifdef _WIN32
-# include <Evil.h>
+# include <windows.h>
 #endif

 #ifdef HAVE_EXECINFO_H
--- a/src/lib/eina/eina_magic.c
+++ b/src/lib/eina/eina_magic.c
@ -23,10 +23,6 @@
 #include <stdlib.h>
 #include <string.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_log.h"
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@ -40,10 +40,6 @@
 #include <mcheck.h>
 #endif

-#ifdef _WIN32
-#include "Evil.h"
-#endif
-
 #include "eina_lock.h"
 #include "eina_config.h"
 #include "eina_private.h"
--- a/src/lib/eina/eina_matrixsparse.c
+++ b/src/lib/eina/eina_matrixsparse.c
@ -33,10 +33,6 @@
 #include <string.h>
 #include <assert.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_log.h"
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@ -32,7 +32,7 @@
 #endif

 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h>
 #endif

 #ifdef HAVE_ESCAPE
--- a/src/lib/eina/eina_prefix.c
+++ b/src/lib/eina/eina_prefix.c
@ -43,7 +43,7 @@

 #ifdef _WIN32
 # include <direct.h> /* getcwd */
-# include <Evil.h>
+# include <evil_private.h> /* path_is_absolute realpath dladdr */
 #endif

 #ifdef HAVE_ESCAPE
--- a/src/lib/eina/eina_private.h
+++ b/src/lib/eina/eina_private.h
@ -25,10 +25,6 @@
 #include <xlocale.h>
 #endif

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_magic.h"
 #include "eina_iterator.h"
 #include "eina_accessor.h"
--- a/src/lib/eina/eina_quadtree.c
+++ b/src/lib/eina/eina_quadtree.c
@ -30,10 +30,6 @@
 #include <stdlib.h>
 #include <stdio.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_quadtree.h"
 #include "eina_magic.h"
 #include "eina_mempool.h"
--- a/src/lib/eina/eina_rectangle.c
+++ b/src/lib/eina/eina_rectangle.c
@ -23,10 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_magic.h"
--- a/src/lib/eina/eina_share_common.c
+++ b/src/lib/eina/eina_share_common.c
@ -63,10 +63,6 @@
 #include <string.h>
 #include <stddef.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_hash.h"
--- a/src/lib/eina/eina_simple_xml_parser.c
+++ b/src/lib/eina/eina_simple_xml_parser.c
@ -26,10 +26,6 @@
 #include <string.h>
 #include <ctype.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_alloca.h"
--- a/src/lib/eina/eina_strbuf.c
+++ b/src/lib/eina/eina_strbuf.c
@ -6,10 +6,6 @@
 #include <string.h>
 #include <ctype.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_private.h"
 #include "eina_str.h"
 #include "eina_strbuf_common.h"
--- a/src/lib/eina/eina_strbuf_common.c
+++ b/src/lib/eina/eina_strbuf_common.c
@ -6,10 +6,6 @@
 #include <stdlib.h>
 #include <string.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_private.h"
 #include "eina_str.h"
 #include "eina_magic.h"
--- a/src/lib/eina/eina_stringshare.c
+++ b/src/lib/eina/eina_stringshare.c
@ -30,10 +30,6 @@
 #include <stdio.h>
 #include <string.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_alloca.h"
--- a/src/lib/eina/eina_tmpstr.c
+++ b/src/lib/eina/eina_tmpstr.c
@ -26,10 +26,6 @@
 #include <stdio.h>
 #include <string.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_log.h"
--- a/src/lib/eina/eina_ustrbuf.c
+++ b/src/lib/eina/eina_ustrbuf.c
@ -2,10 +2,6 @@
 # include "config.h"
 #endif

-#ifdef _WIN32
-#include "Evil.h"
-#endif
-
 #include "eina_strbuf_common.h"
 #include "eina_unicode.h"
 #include "eina_ustrbuf.h"
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@ -24,10 +24,6 @@
 #include <inttypes.h> /* PRId64 and PRIu64 */
 #include <sys/time.h> /* struct timeval */

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_alloca.h"
--- a/src/lib/eina/eina_value_util.c
+++ b/src/lib/eina/eina_value_util.c
@ -23,7 +23,7 @@
 #include <time.h>

 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* strptime */
 #endif

 #include "eina_safety_checks.h"
--- a/src/lib/eina/eina_xattr.c
+++ b/src/lib/eina/eina_xattr.c
@ -32,10 +32,6 @@

 #include <fcntl.h>

-#ifdef _WIN32
-#include "Evil.h"
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"