summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-05-17 13:51:50 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-17 13:51:50 -0400
commit092114ecc8ea39e3fdf0f0e7a7f2db9574269531 (patch)
treecae8c9538fb4c320324c9c95042b4f943c4e00fc /src/lib/ecore_con
parent5922bb268f0222764cf14f68365e6e66e1a9789c (diff)
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
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con.c2
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c4
-rw-r--r--src/lib/ecore_con/ecore_con_local_win32.c1
-rw-r--r--src/lib/ecore_con/ecore_con_proxy_helper.c4
-rw-r--r--src/lib/ecore_con/ecore_con_socks.c1
-rw-r--r--src/lib/ecore_con/efl_net_dialer_ssl.c3
-rw-r--r--src/lib/ecore_con/efl_net_dialer_tcp.c3
-rw-r--r--src/lib/ecore_con/efl_net_dialer_udp.c3
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.c4
-rw-r--r--src/lib/ecore_con/efl_net_server_fd.c3
-rw-r--r--src/lib/ecore_con/efl_net_server_ip.c3
-rw-r--r--src/lib/ecore_con/efl_net_server_tcp.c3
-rw-r--r--src/lib/ecore_con/efl_net_server_udp.c3
-rw-r--r--src/lib/ecore_con/efl_net_server_udp_client.c3
-rw-r--r--src/lib/ecore_con/efl_net_socket_fd.c3
-rw-r--r--src/lib/ecore_con/efl_net_socket_tcp.c3
-rw-r--r--src/lib/ecore_con/efl_net_socket_udp.c3
-rw-r--r--src/lib/ecore_con/efl_net_ssl_conn-openssl.c2
18 files changed, 2 insertions, 49 deletions
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index a781025..75f083a 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -40,7 +40,7 @@
40 40
41#ifdef _WIN32 41#ifdef _WIN32
42# include <ws2tcpip.h> 42# include <ws2tcpip.h>
43# include <Evil.h> 43# include <evil_private.h> /* evil_init|shutdown */
44#endif 44#endif
45 45
46#include "Ecore.h" 46#include "Ecore.h"
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 1956176..d1c402e 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -10,10 +10,6 @@
10# include <sys/socket.h> 10# include <sys/socket.h>
11#endif 11#endif
12 12
13#ifdef _WIN32
14# include <Evil.h>
15#endif
16
17#define EFL_NET_SOCKET_SSL_PROTECTED 13#define EFL_NET_SOCKET_SSL_PROTECTED
18 14
19#include "Ecore.h" 15#include "Ecore.h"
diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 86593a2..6b68bf0 100644
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -4,7 +4,6 @@
4 4
5#include <process.h> 5#include <process.h>
6 6
7#include <Evil.h>
8#include <Ecore.h> 7#include <Ecore.h>
9 8
10#include "Ecore_Con.h" 9#include "Ecore_Con.h"
diff --git a/src/lib/ecore_con/ecore_con_proxy_helper.c b/src/lib/ecore_con/ecore_con_proxy_helper.c
index 1b58ab1..01b9065 100644
--- a/src/lib/ecore_con/ecore_con_proxy_helper.c
+++ b/src/lib/ecore_con/ecore_con_proxy_helper.c
@@ -10,10 +10,6 @@
10#include <unistd.h> 10#include <unistd.h>
11#include <fcntl.h> 11#include <fcntl.h>
12 12
13#ifdef _WIN32
14# include <Evil.h>
15#endif
16
17#include "Ecore.h" 13#include "Ecore.h"
18#include "ecore_private.h" 14#include "ecore_private.h"
19#include "Ecore_Con.h" 15#include "Ecore_Con.h"
diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index 08f5585..0068b33 100644
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@@ -36,7 +36,6 @@
36 36
37#ifdef _WIN32 37#ifdef _WIN32
38# include <ws2tcpip.h> 38# include <ws2tcpip.h>
39# include <Evil.h>
40#endif 39#endif
41 40
42#include "Ecore.h" 41#include "Ecore.h"
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index ffc36a6..efc9d8e 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -24,9 +24,6 @@
24#ifdef HAVE_ARPA_INET_H 24#ifdef HAVE_ARPA_INET_H
25# include <arpa/inet.h> 25# include <arpa/inet.h>
26#endif 26#endif
27#ifdef _WIN32
28# include <Evil.h>
29#endif
30 27
31#define MY_CLASS EFL_NET_DIALER_SSL_CLASS 28#define MY_CLASS EFL_NET_DIALER_SSL_CLASS
32 29
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index ba93fc4..50a3541 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -24,9 +24,6 @@
24#ifdef HAVE_ARPA_INET_H 24#ifdef HAVE_ARPA_INET_H
25# include <arpa/inet.h> 25# include <arpa/inet.h>
26#endif 26#endif
27#ifdef _WIN32
28# include <Evil.h>
29#endif
30 27
31#define MY_CLASS EFL_NET_DIALER_TCP_CLASS 28#define MY_CLASS EFL_NET_DIALER_TCP_CLASS
32 29
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index e75ed24..e353121 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -25,9 +25,6 @@
25#ifdef HAVE_ARPA_INET_H 25#ifdef HAVE_ARPA_INET_H
26# include <arpa/inet.h> 26# include <arpa/inet.h>
27#endif 27#endif
28#ifdef _WIN32
29# include <Evil.h>
30#endif
31 28
32#define MY_CLASS EFL_NET_DIALER_UDP_CLASS 29#define MY_CLASS EFL_NET_DIALER_UDP_CLASS
33 30
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index cc29aba..4ee875e 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -8,10 +8,6 @@
8# include <arpa/inet.h> 8# include <arpa/inet.h>
9#endif 9#endif
10 10
11#ifdef _WIN32
12# include <Evil.h>
13#endif
14
15#include "Ecore.h" 11#include "Ecore.h"
16#include "Ecore_Con.h" 12#include "Ecore_Con.h"
17#include "ecore_con_private.h" 13#include "ecore_con_private.h"
diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c
index e4e6461..d3d61ca 100644
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@@ -13,9 +13,6 @@
13#ifdef HAVE_SYS_SOCKET_H 13#ifdef HAVE_SYS_SOCKET_H
14# include <sys/socket.h> 14# include <sys/socket.h>
15#endif 15#endif
16#ifdef _WIN32
17# include <Evil.h>
18#endif
19 16
20#ifdef HAVE_SYSTEMD 17#ifdef HAVE_SYSTEMD
21# include <systemd/sd-daemon.h> 18# include <systemd/sd-daemon.h>
diff --git a/src/lib/ecore_con/efl_net_server_ip.c b/src/lib/ecore_con/efl_net_server_ip.c
index ea7770a..e7e5e0d 100644
--- a/src/lib/ecore_con/efl_net_server_ip.c
+++ b/src/lib/ecore_con/efl_net_server_ip.c
@@ -22,9 +22,6 @@
22#ifdef HAVE_ARPA_INET_H 22#ifdef HAVE_ARPA_INET_H
23# include <arpa/inet.h> 23# include <arpa/inet.h>
24#endif 24#endif
25#ifdef _WIN32
26# include <Evil.h>
27#endif
28 25
29#define MY_CLASS EFL_NET_SERVER_IP_CLASS 26#define MY_CLASS EFL_NET_SERVER_IP_CLASS
30 27
diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c
index b4bda04..576b5a9 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.c
+++ b/src/lib/ecore_con/efl_net_server_tcp.c
@@ -23,9 +23,6 @@
23#ifdef HAVE_ARPA_INET_H 23#ifdef HAVE_ARPA_INET_H
24# include <arpa/inet.h> 24# include <arpa/inet.h>
25#endif 25#endif
26#ifdef _WIN32
27# include <Evil.h>
28#endif
29 26
30#define MY_CLASS EFL_NET_SERVER_TCP_CLASS 27#define MY_CLASS EFL_NET_SERVER_TCP_CLASS
31 28
diff --git a/src/lib/ecore_con/efl_net_server_udp.c b/src/lib/ecore_con/efl_net_server_udp.c
index 0f0b228..3ae452e 100644
--- a/src/lib/ecore_con/efl_net_server_udp.c
+++ b/src/lib/ecore_con/efl_net_server_udp.c
@@ -25,9 +25,6 @@
25#ifdef HAVE_ARPA_INET_H 25#ifdef HAVE_ARPA_INET_H
26# include <arpa/inet.h> 26# include <arpa/inet.h>
27#endif 27#endif
28#ifdef _WIN32
29# include <Evil.h>
30#endif
31 28
32#define MY_CLASS EFL_NET_SERVER_UDP_CLASS 29#define MY_CLASS EFL_NET_SERVER_UDP_CLASS
33 30
diff --git a/src/lib/ecore_con/efl_net_server_udp_client.c b/src/lib/ecore_con/efl_net_server_udp_client.c
index 9a4a799..5c4e8c0 100644
--- 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 @@
15#ifdef HAVE_SYS_SOCKET_H 15#ifdef HAVE_SYS_SOCKET_H
16# include <sys/socket.h> 16# include <sys/socket.h>
17#endif 17#endif
18#ifdef _WIN32
19# include <Evil.h>
20#endif
21 18
22#define MY_CLASS EFL_NET_SERVER_UDP_CLIENT_CLASS 19#define MY_CLASS EFL_NET_SERVER_UDP_CLIENT_CLASS
23 20
diff --git a/src/lib/ecore_con/efl_net_socket_fd.c b/src/lib/ecore_con/efl_net_socket_fd.c
index 3ade365..8d07ed9 100644
--- a/src/lib/ecore_con/efl_net_socket_fd.c
+++ b/src/lib/ecore_con/efl_net_socket_fd.c
@@ -20,9 +20,6 @@
20#ifdef HAVE_SYS_SOCKET_H 20#ifdef HAVE_SYS_SOCKET_H
21# include <sys/socket.h> 21# include <sys/socket.h>
22#endif 22#endif
23#ifdef _WIN32
24# include <Evil.h>
25#endif
26 23
27#define MY_CLASS EFL_NET_SOCKET_FD_CLASS 24#define MY_CLASS EFL_NET_SOCKET_FD_CLASS
28 25
diff --git a/src/lib/ecore_con/efl_net_socket_tcp.c b/src/lib/ecore_con/efl_net_socket_tcp.c
index cec9712..8a7f0a7 100644
--- a/src/lib/ecore_con/efl_net_socket_tcp.c
+++ b/src/lib/ecore_con/efl_net_socket_tcp.c
@@ -29,9 +29,6 @@
29#ifdef HAVE_ARPA_INET_H 29#ifdef HAVE_ARPA_INET_H
30# include <arpa/inet.h> 30# include <arpa/inet.h>
31#endif 31#endif
32#ifdef _WIN32
33# include <Evil.h>
34#endif
35 32
36#define MY_CLASS EFL_NET_SOCKET_TCP_CLASS 33#define MY_CLASS EFL_NET_SOCKET_TCP_CLASS
37 34
diff --git a/src/lib/ecore_con/efl_net_socket_udp.c b/src/lib/ecore_con/efl_net_socket_udp.c
index 67e3f6a..85a44b8 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.c
+++ b/src/lib/ecore_con/efl_net_socket_udp.c
@@ -29,9 +29,6 @@
29#ifdef HAVE_ARPA_INET_H 29#ifdef HAVE_ARPA_INET_H
30# include <arpa/inet.h> 30# include <arpa/inet.h>
31#endif 31#endif
32#ifdef _WIN32
33# include <Evil.h>
34#endif
35 32
36#define MY_CLASS EFL_NET_SOCKET_UDP_CLASS 33#define MY_CLASS EFL_NET_SOCKET_UDP_CLASS
37 34
diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
index c2a7dc8..3f88c20 100644
--- 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 @@
18#endif 18#endif
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# include <Evil.h> 21# include <evil_private.h> /* dlsym */
22#endif 22#endif
23 23
24#ifdef HAVE_ESCAPE 24#ifdef HAVE_ESCAPE