summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-04-02 10:09:24 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-04-02 10:09:24 -0400
commitb41ed254a9f9dce60eb505f75da30a25fb6ea424 (patch)
treef945ae8bcbb217846471211061f3626c6de5e02b /src/lib/ecore_con
parent96f1e297092157377618850765bdb3f71f396410 (diff)
remove useless check of ws2tcpip.h
Summary: it is useless to check for header files which necessarly exist Test Plan: compilation Reviewers: raster, cedric, zmike Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8535
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con.c5
-rw-r--r--src/lib/ecore_con/ecore_con_local.c2
-rw-r--r--src/lib/ecore_con/ecore_con_socks.c5
-rw-r--r--src/lib/ecore_con/ecore_con_url_curl.c2
-rw-r--r--src/lib/ecore_con/meson.build5
5 files changed, 5 insertions, 14 deletions
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 7c6e93e..a781025 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -38,11 +38,8 @@
38# include <systemd/sd-daemon.h> 38# include <systemd/sd-daemon.h>
39#endif 39#endif
40 40
41#ifdef HAVE_WS2TCPIP_H
42# include <ws2tcpip.h>
43#endif
44
45#ifdef _WIN32 41#ifdef _WIN32
42# include <ws2tcpip.h>
46# include <Evil.h> 43# include <Evil.h>
47#endif 44#endif
48 45
diff --git a/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c
index e91819e..5fed0b7 100644
--- a/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
@@ -17,7 +17,7 @@
17# include <systemd/sd-daemon.h> 17# include <systemd/sd-daemon.h>
18#endif 18#endif
19 19
20#ifdef HAVE_WS2TCPIP_H 20#ifdef _WIN32
21# include <ws2tcpip.h> 21# include <ws2tcpip.h>
22#endif 22#endif
23 23
diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index 8138b26..08f5585 100644
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@@ -34,11 +34,8 @@
34# include <net/if.h> 34# include <net/if.h>
35#endif 35#endif
36 36
37#ifdef HAVE_WS2TCPIP_H
38# include <ws2tcpip.h>
39#endif
40
41#ifdef _WIN32 37#ifdef _WIN32
38# include <ws2tcpip.h>
42# include <Evil.h> 39# include <Evil.h>
43#endif 40#endif
44 41
diff --git a/src/lib/ecore_con/ecore_con_url_curl.c b/src/lib/ecore_con/ecore_con_url_curl.c
index e0d5f93..6e8d9e7 100644
--- a/src/lib/ecore_con/ecore_con_url_curl.c
+++ b/src/lib/ecore_con/ecore_con_url_curl.c
@@ -8,7 +8,7 @@
8#include <sys/types.h> 8#include <sys/types.h>
9#include <unistd.h> 9#include <unistd.h>
10 10
11#ifdef HAVE_WS2TCPIP_H 11#ifdef _WIN32
12# include <ws2tcpip.h> 12# include <ws2tcpip.h>
13#endif 13#endif
14 14
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index 7439042..eacf16f 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -2,10 +2,7 @@ ecore_con_deps = []
2ecore_con_pub_deps = [eina, eo, efl, ecore] 2ecore_con_pub_deps = [eina, eo, efl, ecore]
3 3
4if sys_windows == true 4if sys_windows == true
5 ipv6 = cc.compiles(''' 5 ipv6 = true
6 #include <ws2tcpip.h>
7 struct ipv6_mreq tmp;
8 ''')
9else 6else
10 ipv6 = cc.compiles(''' 7 ipv6 = cc.compiles('''
11 #include <netinet/in.h> 8 #include <netinet/in.h>