efl: remove checks for socket.h, net/*, arpa/*

SVN revision: 82585

configure.ac

@@ -380,7 +380,6 @@ AC_HEADER_TIME
 AC_CHECK_HEADERS([ \
 execinfo.h \
 mcheck.h \
-netinet/in.h \
 sys/epoll.h \
 sys/inotify.h \
 sys/signalfd.h \
@@ -1945,38 +1944,7 @@ EFL_EVAL_PKGS([ECORE_CON])
 
 ### Checks for header files
 
-AC_CHECK_HEADERS([sys/socket.h])
+AC_CHECK_HEADERS([ws2tcpip.h netdb.h])
-AC_CHECK_HEADERS([net/if.h], [], [],
-[
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-])
-AC_CHECK_HEADERS([sys/un.h], [], [],
-[
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-])
-AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h])
 
 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...])
@@ -1989,9 +1957,7 @@ AC_CHECK_TYPES([struct ipv6_mreq],
    [have_ipv6="yes"],
    [have_ipv6="no"],
    [[
-#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
-# include <netinet/in.h>
-#endif
 #ifdef HAVE_WS2TCPIP_H
 # include <ws2tcpip.h>
 #endif

src/bin/evas/loaders/psd/evas_image_load_psd.c

@@ -14,10 +14,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-
+#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
 
 #ifdef HAVE_EVIL
 # include <Evil.h>

src/lib/ecore_con/ecore_con.c

@@ -9,26 +9,11 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-
+#include <sys/socket.h>
-#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
-# include <netinet/tcp.h>
+#include <netinet/in.h>
-#endif
+#include <arpa/inet.h>
-
+#include <sys/un.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-
-#ifdef HAVE_SYS_UN_H
-# include <sys/un.h>
-#endif
 
 #ifdef HAVE_WS2TCPIP_H
 # include <ws2tcpip.h>
@@ -1454,12 +1439,10 @@ _ecore_con_cb_tcp_listen(void           *data,
 
    if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_NODELAY)
      {
-#ifdef HAVE_NETINET_TCP_H
         int flag = 1;
 
         if (setsockopt(svr->fd, IPPROTO_TCP, TCP_NODELAY, (char *)&flag,
                        sizeof(int)) < 0)
-#endif
           {
              goto error;
           }
@@ -1598,11 +1581,9 @@ _ecore_con_cb_tcp_connect(void           *data,
 
    if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_NODELAY)
      {
-#ifdef HAVE_NETINET_TCP_H
         int flag = 1;
 
         if (setsockopt(svr->fd, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(int)) < 0)
-#endif
           {
              goto error;
           }

src/lib/ecore_con/ecore_con_ares.c

@@ -11,14 +11,8 @@
 
 #include <string.h>
 #include <sys/types.h>
-
+#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_H
+#include <arpa/inet.h>
-# include <netinet/in.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
 
 #include <ares.h>
 

src/lib/ecore_con/ecore_con_dns.c

@@ -12,14 +12,8 @@
 #include <string.h>
 #include <sys/types.h>
 #include <errno.h> /* for EAGAIN */
-
+#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_H
+#include <arpa/inet.h>
-# include <netinet/in.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
 
 #include "dns.h"
 

src/lib/ecore_con/ecore_con_info.c

@@ -23,25 +23,13 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <sys/socket.h>
 #ifdef __OpenBSD__
 # include <sys/types.h>
 #endif
-
+#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_H
+#include <arpa/inet.h>
-# include <netinet/in.h>
+#include <arpa/nameser.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 
 #ifdef HAVE_NETDB_H
 # include <netdb.h>

src/lib/ecore_con/ecore_con_local.c

@@ -10,14 +10,8 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
+#include <sys/socket.h>
-#ifdef HAVE_SYS_SOCKET_H
+#include <sys/un.h>
-# include <sys/socket.h>
-#endif
-
-#ifdef HAVE_SYS_UN_H
-# include <sys/un.h>
-#endif
 
 #ifdef HAVE_WS2TCPIP_H
 # include <ws2tcpip.h>

src/lib/ecore_con/ecore_con_socks.c

@@ -10,39 +10,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#ifdef HAVE_SYS_SOCKET_H
+#include <arpa/inet.h>
-# include <sys/socket.h>
+#include <net/if.h>
-#endif
+#include <netinet/in.h>
-
+#include <netinet/tcp.h>
-#ifdef HAVE_NETINET_TCP_H
+#include <sys/un.h>
-# include <netinet/tcp.h>
+#include <sys/socket.h>
-#endif
-
-#ifdef HAVE_NET_IF_H
-# include <net/if.h>
-#endif
-
-/* if net/if.h is not found or if an older versions of net/if.h is provided
-   which does not define IF_NAMESIZE. We must define it ourselves */
-#ifndef IF_NAMESIZE
-#  ifdef IFNAMSIZ
-#    define IF_NAMESIZE IFNAMSIZ
-#  else
-#    define IF_NAMESIZE 16
-#  endif
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_SYS_UN_H
-# include <sys/un.h>
-#endif
 
 #ifdef HAVE_WS2TCPIP_H
 # include <ws2tcpip.h>

src/lib/ecore_ipc/ecore_ipc.c

@@ -3,11 +3,8 @@
 #endif
 
 #include <string.h>
-
+#include <sys/types.h>
-#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
-# include <sys/types.h>
-# include <netinet/in.h>
-#endif
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>

src/lib/eet/eet_cipher.c

@@ -8,9 +8,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
-# include <netinet/in.h>
-#endif /* ifdef HAVE_NETINET_IN_H */
 
 #ifdef HAVE_SIGNATURE
 # include <sys/mman.h>

src/lib/eet/eet_connection.c

@@ -4,10 +4,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-
+#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif /* ifdef HAVE_NETINET_IN_H */
 
 #ifdef _WIN32
 # include <winsock2.h>

src/lib/eet/eet_data.c

@@ -7,10 +7,7 @@
 #include <math.h>
 #include <ctype.h>
 #include <limits.h>
-
+#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif /* ifdef HAVE_NETINET_IN_H */
 
 #ifdef _WIN32
 # include <winsock2.h>

src/lib/eet/eet_image.c

@@ -2,12 +2,10 @@
 # include <config.h>
 #endif /* ifdef HAVE_CONFIG_H */
 
-#ifdef HAVE_NETINET_IN_H
+#ifdef __OpenBSD__
-# ifdef __OpenBSD__
+# include <sys/types.h>
-#  include <sys/types.h>
+#endif /* ifdef __OpenBSD__ */
-# endif /* ifdef __OpenBSD__ */
+#include <netinet/in.h>
-# include <netinet/in.h>
-#endif /* ifdef HAVE_NETINET_IN_H */
 
 #ifdef _WIN32
 # include <winsock2.h>

src/lib/eet/eet_lib.c

@@ -16,10 +16,7 @@
 #include <fnmatch.h>
 #include <fcntl.h>
 #include <zlib.h>
-
+#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif /* ifdef HAVE_NETINET_IN_H */
 
 #ifdef HAVE_EVIL
 # include <Evil.h>

src/lib/efreet/efreet_mime.c

@@ -8,19 +8,13 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <fnmatch.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #ifdef _WIN32
 # include <winsock2.h>
 #endif
 
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-
 #include <Ecore.h>
 #include <Ecore_File.h>
 

src/modules/evas/loaders/psd/evas_image_load_psd.c

@@ -14,10 +14,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-
+#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
 
 #ifdef HAVE_EVIL
 # include <Evil.h>