setup_once.h: refactor inclusion of <unistd.h> and <sys/socket.h>

Inclusion of these two header files now done in setup_once.h

diff --git a/acountry.c b/acountry.c
index 6a203746bd1be4ea6127b7f4bfa3c359233101b1..7a855c048ce952abf134c05fbdcbd4853f71b9e6 100644 (file)
--- a/acountry.c
+++ b/acountry.c
@@ -34,9 +34,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -44,7 +41,6 @@
 #if defined(WIN32) && !defined(WATT32)
   #include <winsock.h>
 #else
-  #include <sys/socket.h>
   #include <arpa/inet.h>
   #include <netinet/in.h>
   #include <netdb.h>

diff --git a/adig.c b/adig.c
index 19f6057dfd8744aef01c28aede7bfee70b53ef6e..478310174832fd6379e53517cfcf77589d8cb029 100644 (file)
--- a/adig.c
+++ b/adig.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
@@ -37,9 +34,6 @@
 #  include <arpa/nameser_compat.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif

diff --git a/ahost.c b/ahost.c
index d415964c85ee7bf537ef86081e674af5eb293048..cb2bea1bd02dda18b667ea67429e250a0d744160 100644 (file)
--- a/ahost.c
+++ b/ahost.c
@@ -17,14 +17,11 @@
 #include "ares_setup.h"
 
 #if !defined(WIN32) || defined(WATT32)
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #endif
+
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif

diff --git a/ares__close_sockets.c b/ares__close_sockets.c
index e819e7dbd2ebcff27b14df4e3dd3432f187702ae..d3d85ff183c7d107e01de04084f6a2a2a7216735 100644 (file)
--- a/ares__close_sockets.c
+++ b/ares__close_sockets.c
@@ -16,10 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "ares.h"
 #include "ares_private.h"
 

diff --git a/ares__get_hostent.c b/ares__get_hostent.c
index 94428ee95c3e50d2263faf2279c5f11d91aa882b..a9a80ef5e5afc71393ec3db03b79e552bcb79e39 100644 (file)
--- a/ares__get_hostent.c
+++ b/ares__get_hostent.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_create_query.c b/ares_create_query.c
index f41a0ef867e63cfce674975b74b8322380cda556..8624e2f589bbb36c0a3d91684c1d1c75e6c7967a 100644 (file)
--- a/ares_create_query.c
+++ b/ares_create_query.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_expand_name.c b/ares_expand_name.c
index e69f1afb4f1d02826c46c4a82b631ca1c6722590..a66dfa97332a604043fb511b85494ef1dccac7b3 100644 (file)
--- a/ares_expand_name.c
+++ b/ares_expand_name.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_expand_string.c b/ares_expand_string.c
index e55f53be7d1e24b14cdbc66c6155f17c27f99061..96d1be34b38c606b6a0e510659e9db16b82919c0 100644 (file)
--- a/ares_expand_string.c
+++ b/ares_expand_string.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_gethostbyaddr.c b/ares_gethostbyaddr.c
index 9971c4f6cae5d257646b6fdce3f33ccb6d4b8c8b..669a29d3d6e15c0c5b6373fb24bf1fc286250997 100644 (file)
--- a/ares_gethostbyaddr.c
+++ b/ares_gethostbyaddr.c
@@ -15,9 +15,6 @@
  */
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_gethostbyname.c b/ares_gethostbyname.c
index 90f03a23f091e459736dadc5c2886dbd5f0127e9..428b1ee6a7871b6dc19950d3ca678385929f674a 100644 (file)
--- a/ares_gethostbyname.c
+++ b/ares_gethostbyname.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_getnameinfo.c b/ares_getnameinfo.c
index 351fb08c82051270e6291769f21fa76099e0f0f5..75cb7edf526b1e15b477e6ad598ca37d43d1aff7 100644 (file)
--- a/ares_getnameinfo.c
+++ b/ares_getnameinfo.c
@@ -22,9 +22,6 @@
 #  endif
 #endif
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
@@ -47,10 +44,6 @@
 #include <net/if.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "ares.h"
 #include "ares_ipv6.h"
 #include "inet_ntop.h"

diff --git a/ares_init.c b/ares_init.c
index 15d2934fe192f51f58a0e3afd66f50a7047efa0f..aab1a50f5cea1308681f2d1b67242e341e13b3c8 100644 (file)
--- a/ares_init.c
+++ b/ares_init.c
@@ -21,10 +21,6 @@
 #include <sys/param.h>
 #endif
 
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -46,10 +42,6 @@
 #  include <arpa/nameser_compat.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #if defined(ANDROID) || defined(__ANDROID__)
 #include <sys/system_properties.h>
 /* From the Bionic sources */

diff --git a/ares_nowarn.c b/ares_nowarn.c
index dc33bcff8c88d254b53f6ff71b521e3d2ee564e4..a4dce8963d3dafd6607ff63295e7f18d494ec639 100644 (file)
--- a/ares_nowarn.c
+++ b/ares_nowarn.c
@@ -23,9 +23,6 @@
 
 #if defined(__INTEL_COMPILER) && defined(__unix__)
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_parse_a_reply.c b/ares_parse_a_reply.c
index 641ae795e43f161471312499bb0c1a1f2fa2d789..9683ef5e135b8798593c631cc70fe1523127d9f9 100644 (file)
--- a/ares_parse_a_reply.c
+++ b/ares_parse_a_reply.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_parse_aaaa_reply.c b/ares_parse_aaaa_reply.c
index d23676a0b39fa4ada678ab4e4d9a83938f53347b..f5b6eaef1025f09d77629a84d96c8b2b120f0326 100644 (file)
--- a/ares_parse_aaaa_reply.c
+++ b/ares_parse_aaaa_reply.c
@@ -17,9 +17,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_parse_mx_reply.c b/ares_parse_mx_reply.c
index bc5e812d49d52255e859e052863adfa4da3c041b..32d3af4835e8c73bd95f281499bad5cdff35dd92 100644 (file)
--- a/ares_parse_mx_reply.c
+++ b/ares_parse_mx_reply.c
@@ -17,9 +17,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_parse_naptr_reply.c b/ares_parse_naptr_reply.c
index 73a57a04647f35ba5b65d5f58ef64261ab95d295..9315df7297963287b65a3c3064a4f430c4fae7c1 100644 (file)
--- a/ares_parse_naptr_reply.c
+++ b/ares_parse_naptr_reply.c
@@ -17,9 +17,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_parse_ns_reply.c b/ares_parse_ns_reply.c
index 1a4e80126fa3cbf40ac04b1dc59eed685903793b..553f25349785b2c9cd3d0a2b9f5ebd807d64a879 100644 (file)
--- a/ares_parse_ns_reply.c
+++ b/ares_parse_ns_reply.c
@@ -20,9 +20,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_parse_ptr_reply.c b/ares_parse_ptr_reply.c
index bb62b67148c3c5af5738bcdda61fc169344df3df..b505b9266543b7b813b3ede57674669fd0c3784e 100644 (file)
--- a/ares_parse_ptr_reply.c
+++ b/ares_parse_ptr_reply.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_parse_soa_reply.c b/ares_parse_soa_reply.c
index 611a21569868435e09ca55299d52ea65836229c8..da1c6dccaf13eee5a4c4de338cee780e7edcb877 100644 (file)
--- a/ares_parse_soa_reply.c
+++ b/ares_parse_soa_reply.c
@@ -17,9 +17,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_parse_srv_reply.c b/ares_parse_srv_reply.c
index 6b2526cab2da72b325e2b6e425b5e35d9ead1f31..9f61f19bb6397d24202dc235b7de2e54cb823054 100644 (file)
--- a/ares_parse_srv_reply.c
+++ b/ares_parse_srv_reply.c
@@ -17,9 +17,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_parse_txt_reply.c b/ares_parse_txt_reply.c
index 26737ed4627296a59c68101666a35207963a40b8..dcc64736f3ebd926e96adc63a288268773f9f817 100644 (file)
--- a/ares_parse_txt_reply.c
+++ b/ares_parse_txt_reply.c
@@ -17,9 +17,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_process.c b/ares_process.c
index 25eb24c0bc700d4775f2ee92fa7083d6727293a8..2a02f16fcd22a1991a537a9571d89ff3caca9940 100644 (file)
--- a/ares_process.c
+++ b/ares_process.c
@@ -17,9 +17,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_SYS_UIO_H
 #  include <sys/uio.h>
 #endif
@@ -44,9 +41,6 @@
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 #endif

diff --git a/ares_query.c b/ares_query.c
index 6104128fc984b5fe89ee25cec3c66c43c05b08ec..31084da29c8a7b83cbf03205aa7cc3ea895c9a4e 100644 (file)
--- a/ares_query.c
+++ b/ares_query.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/ares_send.c b/ares_send.c
index ab85a2d6984c3d1709362f7e3956360854a304eb..1a450b1e6d85ce29ab12e1aebce9c2feada92eb2 100644 (file)
--- a/ares_send.c
+++ b/ares_send.c
@@ -16,9 +16,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/inet_net_pton.c b/inet_net_pton.c
index f4e58f9d293edbdd1ca65265f2aa1c8d0381235c..81999342d8524e13b6013bf5758966d7dcc191a6 100644 (file)
--- a/inet_net_pton.c
+++ b/inet_net_pton.c
@@ -18,9 +18,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/inet_ntop.c b/inet_ntop.c
index e5ffb107ae8498c7651511553322a759e2b67a27..ea1ebb8c57a9c61cab9c6150ce62dc78d8477ff8 100644 (file)
--- a/inet_ntop.c
+++ b/inet_ntop.c
@@ -17,9 +17,6 @@
 
 #include "ares_setup.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif

diff --git a/setup_once.h b/setup_once.h
index bb261e7a88128968def4bc66b1f8058a3d4eaa41..3dad5341364d686a116f3bff2225bde463e2e4b8 100644 (file)
--- a/setup_once.h
+++ b/setup_once.h
@@ -76,6 +76,14 @@
 #include <stdbool.h>
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 
 /*
  * Definition of timeval struct for platforms that don't have it.