summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--configure.ac21
-rw-r--r--header_checks/meson.build1
-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
7 files changed, 16 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac
index 01abaefedd..0adee07f76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3258,7 +3258,7 @@ EFL_EVAL_PKGS([ECORE_CON])
3258 3258
3259### Checks for header files 3259### Checks for header files
3260 3260
3261AC_CHECK_HEADERS([ws2tcpip.h netdb.h sys/filio.h]) 3261AC_CHECK_HEADERS([netdb.h sys/filio.h])
3262 3262
3263if test "x${ac_cv_header_netdb_h}" = "xno" && test "x${have_windows}" = "xno"; then 3263if test "x${ac_cv_header_netdb_h}" = "xno" && test "x${have_windows}" = "xno"; then
3264 AC_MSG_ERROR([netdb.h is requested to have Ecore_Con. Exiting...]) 3264 AC_MSG_ERROR([netdb.h is requested to have Ecore_Con. Exiting...])
@@ -3266,18 +3266,19 @@ fi
3266 3266
3267### Checks for types 3267### Checks for types
3268 3268
3269have_ipv6="no" 3269if test "x${have_win32}" = "xyes" ; then
3270AC_CHECK_TYPES([struct ipv6_mreq], 3270 have_ipv6="yes"
3271 [have_ipv6="yes"], 3271else
3272 [have_ipv6="no"], 3272 have_ipv6="no"
3273 [[ 3273 AC_CHECK_TYPES([struct ipv6_mreq],
3274 [have_ipv6="yes"],
3275 [have_ipv6="no"],
3276 [[
3274#ifdef HAVE_NETINET_IN_H 3277#ifdef HAVE_NETINET_IN_H
3275# include <netinet/in.h> 3278# include <netinet/in.h>
3276#endif 3279#endif
3277#ifdef HAVE_WS2TCPIP_H 3280 ]])
3278# include <ws2tcpip.h> 3281fi
3279#endif
3280]])
3281 3282
3282AC_DEFINE_IF([HAVE_IPV6], 3283AC_DEFINE_IF([HAVE_IPV6],
3283 [test "x${have_ipv6}" = "xyes"], 3284 [test "x${have_ipv6}" = "xyes"],
diff --git a/header_checks/meson.build b/header_checks/meson.build
index 48eeb89d2a..42d638fc6a 100644
--- a/header_checks/meson.build
+++ b/header_checks/meson.build
@@ -52,7 +52,6 @@ header_checks = [
52 'langinfo.h', 52 'langinfo.h',
53 'locale.h', 53 'locale.h',
54 'uv.h', 54 'uv.h',
55 'ws2tcpip.h',
56 'crt_externs.h' 55 'crt_externs.h'
57] 56]
58 57
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 7c6e93e62f..a781025d7b 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 e91819ec42..5fed0b711e 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 8138b26525..08f5585381 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 e0d5f93c6b..6e8d9e73c3 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 743904285c..eacf16f720 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>