summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorVincent 'vtorri' Torri <vincent.torri@gmail.com>2017-09-22 05:06:10 -0500
committerStephen 'Okra' Houston <smhouston88@gmail.com>2017-09-22 05:06:10 -0500
commit0cdd50124690ea0d72bef304fff15b4be2adee41 (patch)
treec6cfefef7351a7d0ba4bd32028f9c24e081edefc /src/lib/ecore_con
parent7db24851936e7fe654ba77cbad47316577cce5f7 (diff)
EFL For WIN32: Replace HAVE_EVIL define with _WIN32
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con.c8
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c2
-rw-r--r--src/lib/ecore_con/ecore_con_proxy_helper.c2
-rw-r--r--src/lib/ecore_con/ecore_con_socks.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_ssl.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_fd.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_udp_client.c2
-rw-r--r--src/lib/ecore_con/efl_net_socket_fd.c2
-rw-r--r--src/lib/ecore_con/efl_net_socket_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_socket_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_ssl_conn-openssl.c2
16 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index ce881fa315..418add7aa1 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -42,7 +42,7 @@
42# include <ws2tcpip.h> 42# include <ws2tcpip.h>
43#endif 43#endif
44 44
45#ifdef HAVE_EVIL 45#ifdef _WIN32
46# include <Evil.h> 46# include <Evil.h>
47#endif 47#endif
48 48
@@ -84,7 +84,7 @@ ecore_con_init(void)
84 if (++_ecore_con_init_count != 1) 84 if (++_ecore_con_init_count != 1)
85 return _ecore_con_init_count; 85 return _ecore_con_init_count;
86 86
87#ifdef HAVE_EVIL 87#ifdef _WIN32
88 if (!evil_init()) 88 if (!evil_init())
89 return --_ecore_con_init_count; 89 return --_ecore_con_init_count;
90#endif 90#endif
@@ -129,7 +129,7 @@ ecore_con_log_error:
129 ecore_shutdown(); 129 ecore_shutdown();
130 130
131ecore_err: 131ecore_err:
132#ifdef HAVE_EVIL 132#ifdef _WIN32
133 evil_shutdown(); 133 evil_shutdown();
134#endif 134#endif
135 return --_ecore_con_init_count; 135 return --_ecore_con_init_count;
@@ -160,7 +160,7 @@ ecore_con_shutdown(void)
160 */ 160 */
161 161
162 ecore_shutdown(); 162 ecore_shutdown();
163#ifdef HAVE_EVIL 163#ifdef _WIN32
164 evil_shutdown(); 164 evil_shutdown();
165#endif 165#endif
166 166
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index ade01e222f..fa71139dca 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -10,7 +10,7 @@
10# include <sys/socket.h> 10# include <sys/socket.h>
11#endif 11#endif
12 12
13#ifdef HAVE_EVIL 13#ifdef _WIN32
14# include <Evil.h> 14# include <Evil.h>
15#endif 15#endif
16 16
diff --git a/src/lib/ecore_con/ecore_con_proxy_helper.c b/src/lib/ecore_con/ecore_con_proxy_helper.c
index 43feead87e..ff0253f055 100644
--- a/src/lib/ecore_con/ecore_con_proxy_helper.c
+++ b/src/lib/ecore_con/ecore_con_proxy_helper.c
@@ -10,7 +10,7 @@
10#include <unistd.h> 10#include <unistd.h>
11#include <fcntl.h> 11#include <fcntl.h>
12 12
13#ifdef HAVE_EVIL 13#ifdef _WIN32
14# include <Evil.h> 14# include <Evil.h>
15#endif 15#endif
16 16
diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index a81d37505f..8138b26525 100644
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@@ -38,7 +38,7 @@
38# include <ws2tcpip.h> 38# include <ws2tcpip.h>
39#endif 39#endif
40 40
41#ifdef HAVE_EVIL 41#ifdef _WIN32
42# include <Evil.h> 42# include <Evil.h>
43#endif 43#endif
44 44
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index 6bdae468c8..eb68859325 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -24,7 +24,7 @@
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 HAVE_EVIL 27#ifdef _WIN32
28# include <Evil.h> 28# include <Evil.h>
29#endif 29#endif
30 30
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index a9d87cfa6d..3b450441b1 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -24,7 +24,7 @@
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 HAVE_EVIL 27#ifdef _WIN32
28# include <Evil.h> 28# include <Evil.h>
29#endif 29#endif
30 30
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index bd2bf7e617..c7541dee5f 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -25,7 +25,7 @@
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 HAVE_EVIL 28#ifdef _WIN32
29# include <Evil.h> 29# include <Evil.h>
30#endif 30#endif
31 31
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index f5500e3dcd..252b6e6a22 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -8,7 +8,7 @@
8# include <arpa/inet.h> 8# include <arpa/inet.h>
9#endif 9#endif
10 10
11#ifdef HAVE_EVIL 11#ifdef _WIN32
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c
index f1ff38bd77..c04b6c2186 100644
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@@ -13,7 +13,7 @@
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 HAVE_EVIL 16#ifdef _WIN32
17# include <Evil.h> 17# include <Evil.h>
18#endif 18#endif
19 19
diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c
index f82d57babe..de4da818a8 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.c
+++ b/src/lib/ecore_con/efl_net_server_tcp.c
@@ -23,7 +23,7 @@
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 HAVE_EVIL 26#ifdef _WIN32
27# include <Evil.h> 27# include <Evil.h>
28#endif 28#endif
29 29
diff --git a/src/lib/ecore_con/efl_net_server_udp.c b/src/lib/ecore_con/efl_net_server_udp.c
index f45fd615ee..9159929818 100644
--- a/src/lib/ecore_con/efl_net_server_udp.c
+++ b/src/lib/ecore_con/efl_net_server_udp.c
@@ -25,7 +25,7 @@
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 HAVE_EVIL 28#ifdef _WIN32
29# include <Evil.h> 29# include <Evil.h>
30#endif 30#endif
31 31
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 e9ce54ca29..134a05cb65 100644
--- a/src/lib/ecore_con/efl_net_server_udp_client.c
+++ b/src/lib/ecore_con/efl_net_server_udp_client.c
@@ -15,7 +15,7 @@
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 HAVE_EVIL 18#ifdef _WIN32
19# include <Evil.h> 19# include <Evil.h>
20#endif 20#endif
21 21
diff --git a/src/lib/ecore_con/efl_net_socket_fd.c b/src/lib/ecore_con/efl_net_socket_fd.c
index e0e05d6328..d02e58663c 100644
--- a/src/lib/ecore_con/efl_net_socket_fd.c
+++ b/src/lib/ecore_con/efl_net_socket_fd.c
@@ -20,7 +20,7 @@
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 HAVE_EVIL 23#ifdef _WIN32
24# include <Evil.h> 24# include <Evil.h>
25#endif 25#endif
26 26
diff --git a/src/lib/ecore_con/efl_net_socket_tcp.c b/src/lib/ecore_con/efl_net_socket_tcp.c
index 90096185c5..a6179bea8c 100644
--- a/src/lib/ecore_con/efl_net_socket_tcp.c
+++ b/src/lib/ecore_con/efl_net_socket_tcp.c
@@ -29,7 +29,7 @@
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 HAVE_EVIL 32#ifdef _WIN32
33# include <Evil.h> 33# include <Evil.h>
34#endif 34#endif
35 35
diff --git a/src/lib/ecore_con/efl_net_socket_udp.c b/src/lib/ecore_con/efl_net_socket_udp.c
index f30a57a591..c887a964a5 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.c
+++ b/src/lib/ecore_con/efl_net_socket_udp.c
@@ -29,7 +29,7 @@
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 HAVE_EVIL 32#ifdef _WIN32
33# include <Evil.h> 33# include <Evil.h>
34#endif 34#endif
35 35
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 88bb3bc204..37457e96b3 100644
--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
@@ -17,7 +17,7 @@
17# include <dlfcn.h> 17# include <dlfcn.h>
18#endif 18#endif
19 19
20#ifdef HAVE_EVIL 20#ifdef _WIN32
21# include <Evil.h> 21# include <Evil.h>
22#endif 22#endif
23 23