bin/eet and ecore_con: remove Evil.h when not necessary and include evil_private.h when necessary

Test Plan: compilation Reviewers: raster, zmike, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8911
4 years ago · 092114ecc8
parent 5922bb268f
commit 092114ecc8
20 changed files with 2 additions and 57 deletions
--- a/src/bin/ecore_con/efl_net_proxy_helper.c
+++ b/src/bin/ecore_con/efl_net_proxy_helper.c
@ -10,10 +10,6 @@
 #include <unistd.h>
 #include <fcntl.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "Eina.h"

 #ifdef ERR
--- a/src/bin/eet/eet_main.c
+++ b/src/bin/eet/eet_main.c
@ -7,10 +7,6 @@
 #include <string.h>
 #include <unistd.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif /* ifdef _WIN32 */
-
 #include <Eet.h>

 static int _eet_main_log_dom = -1;
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@ -40,7 +40,7 @@

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

 #include "Ecore.h"
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@ -10,10 +10,6 @@
 # include <sys/socket.h>
 #endif

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #define EFL_NET_SOCKET_SSL_PROTECTED

 #include "Ecore.h"
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@ -4,7 +4,6 @@

 #include <process.h>

-#include <Evil.h>
 #include <Ecore.h>

 #include "Ecore_Con.h"
--- a/src/lib/ecore_con/ecore_con_proxy_helper.c
+++ b/src/lib/ecore_con/ecore_con_proxy_helper.c
@ -10,10 +10,6 @@
 #include <unistd.h>
 #include <fcntl.h>

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "Ecore.h"
 #include "ecore_private.h"
 #include "Ecore_Con.h"
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@ -36,7 +36,6 @@

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

 #include "Ecore.h"
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@ -24,9 +24,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_DIALER_SSL_CLASS

--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@ -24,9 +24,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_DIALER_TCP_CLASS

--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@ -25,9 +25,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_DIALER_UDP_CLASS

--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@ -8,10 +8,6 @@
 # include <arpa/inet.h>
 #endif

-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "Ecore.h"
 #include "Ecore_Con.h"
 #include "ecore_con_private.h"
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@ -13,9 +13,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #ifdef HAVE_SYSTEMD
 # include <systemd/sd-daemon.h>
--- a/src/lib/ecore_con/efl_net_server_ip.c
+++ b/src/lib/ecore_con/efl_net_server_ip.c
@ -22,9 +22,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_SERVER_IP_CLASS

--- a/src/lib/ecore_con/efl_net_server_tcp.c
+++ b/src/lib/ecore_con/efl_net_server_tcp.c
@ -23,9 +23,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_SERVER_TCP_CLASS

--- a/src/lib/ecore_con/efl_net_server_udp.c
+++ b/src/lib/ecore_con/efl_net_server_udp.c
@ -25,9 +25,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_SERVER_UDP_CLASS

--- a/src/lib/ecore_con/efl_net_server_udp_client.c
+++ b/src/lib/ecore_con/efl_net_server_udp_client.c
@ -15,9 +15,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_SERVER_UDP_CLIENT_CLASS

--- a/src/lib/ecore_con/efl_net_socket_fd.c
+++ b/src/lib/ecore_con/efl_net_socket_fd.c
@ -20,9 +20,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_SOCKET_FD_CLASS

--- a/src/lib/ecore_con/efl_net_socket_tcp.c
+++ b/src/lib/ecore_con/efl_net_socket_tcp.c
@ -29,9 +29,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_SOCKET_TCP_CLASS

--- a/src/lib/ecore_con/efl_net_socket_udp.c
+++ b/src/lib/ecore_con/efl_net_socket_udp.c
@ -29,9 +29,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif

 #define MY_CLASS EFL_NET_SOCKET_UDP_CLASS

--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
@ -18,7 +18,7 @@
 #endif

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

 #ifdef HAVE_ESCAPE