forked from enlightenment/efl
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
This commit is contained in:
parent
96f1e29709
commit
b41ed254a9
21
configure.ac
21
configure.ac
|
@ -3258,7 +3258,7 @@ EFL_EVAL_PKGS([ECORE_CON])
|
||||||
|
|
||||||
### Checks for header files
|
### Checks for header files
|
||||||
|
|
||||||
AC_CHECK_HEADERS([ws2tcpip.h netdb.h sys/filio.h])
|
AC_CHECK_HEADERS([netdb.h sys/filio.h])
|
||||||
|
|
||||||
if test "x${ac_cv_header_netdb_h}" = "xno" && test "x${have_windows}" = "xno"; then
|
if test "x${ac_cv_header_netdb_h}" = "xno" && test "x${have_windows}" = "xno"; then
|
||||||
AC_MSG_ERROR([netdb.h is requested to have Ecore_Con. Exiting...])
|
AC_MSG_ERROR([netdb.h is requested to have Ecore_Con. Exiting...])
|
||||||
|
@ -3266,18 +3266,19 @@ fi
|
||||||
|
|
||||||
### Checks for types
|
### Checks for types
|
||||||
|
|
||||||
have_ipv6="no"
|
if test "x${have_win32}" = "xyes" ; then
|
||||||
AC_CHECK_TYPES([struct ipv6_mreq],
|
have_ipv6="yes"
|
||||||
[have_ipv6="yes"],
|
else
|
||||||
[have_ipv6="no"],
|
have_ipv6="no"
|
||||||
[[
|
AC_CHECK_TYPES([struct ipv6_mreq],
|
||||||
|
[have_ipv6="yes"],
|
||||||
|
[have_ipv6="no"],
|
||||||
|
[[
|
||||||
#ifdef HAVE_NETINET_IN_H
|
#ifdef HAVE_NETINET_IN_H
|
||||||
# include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_WS2TCPIP_H
|
]])
|
||||||
# include <ws2tcpip.h>
|
fi
|
||||||
#endif
|
|
||||||
]])
|
|
||||||
|
|
||||||
AC_DEFINE_IF([HAVE_IPV6],
|
AC_DEFINE_IF([HAVE_IPV6],
|
||||||
[test "x${have_ipv6}" = "xyes"],
|
[test "x${have_ipv6}" = "xyes"],
|
||||||
|
|
|
@ -52,7 +52,6 @@ header_checks = [
|
||||||
'langinfo.h',
|
'langinfo.h',
|
||||||
'locale.h',
|
'locale.h',
|
||||||
'uv.h',
|
'uv.h',
|
||||||
'ws2tcpip.h',
|
|
||||||
'crt_externs.h'
|
'crt_externs.h'
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -38,11 +38,8 @@
|
||||||
# include <systemd/sd-daemon.h>
|
# include <systemd/sd-daemon.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_WS2TCPIP_H
|
|
||||||
# include <ws2tcpip.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
# include <ws2tcpip.h>
|
||||||
# include <Evil.h>
|
# include <Evil.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
# include <systemd/sd-daemon.h>
|
# include <systemd/sd-daemon.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_WS2TCPIP_H
|
#ifdef _WIN32
|
||||||
# include <ws2tcpip.h>
|
# include <ws2tcpip.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -34,11 +34,8 @@
|
||||||
# include <net/if.h>
|
# include <net/if.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_WS2TCPIP_H
|
|
||||||
# include <ws2tcpip.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
# include <ws2tcpip.h>
|
||||||
# include <Evil.h>
|
# include <Evil.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#ifdef HAVE_WS2TCPIP_H
|
#ifdef _WIN32
|
||||||
# include <ws2tcpip.h>
|
# include <ws2tcpip.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,7 @@ ecore_con_deps = []
|
||||||
ecore_con_pub_deps = [eina, eo, efl, ecore]
|
ecore_con_pub_deps = [eina, eo, efl, ecore]
|
||||||
|
|
||||||
if sys_windows == true
|
if sys_windows == true
|
||||||
ipv6 = cc.compiles('''
|
ipv6 = true
|
||||||
#include <ws2tcpip.h>
|
|
||||||
struct ipv6_mreq tmp;
|
|
||||||
''')
|
|
||||||
else
|
else
|
||||||
ipv6 = cc.compiles('''
|
ipv6 = cc.compiles('''
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
Loading…
Reference in New Issue