Make sure sys/socket.h is included before netinet/in.h (required by

OpenWatcom C)

diff --git a/ares/ares.h b/ares/ares.h
index 7ea70543facae651d8858741da64f846e1fc3c37..e2c7f4c0511873176bdd92c0b2701a72faaf040e 100644 (file)
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -51,8 +51,8 @@
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
 #else
-  #include <netinet/in.h>
   #include <sys/socket.h>
+  #include <netinet/in.h>
 #endif
 
 #ifdef  __cplusplus

diff --git a/ares/ares_expand_name.c b/ares/ares_expand_name.c
index dc5b1075336419f09b3385cdd87c3579ae446994..8a9d82215466a4c3ed3b85e9deee6182222a3a19 100644 (file)
--- a/ares/ares_expand_name.c
+++ b/ares/ares_expand_name.c
@@ -17,6 +17,9 @@
 
 #include "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/ares_expand_string.c b/ares/ares_expand_string.c
index ead60a4071ce286d88f49e32bb264c54ddd9b738..f2d4f748a5a8c50c3032973032c94b8b67bd231e 100644 (file)
--- a/ares/ares_expand_string.c
+++ b/ares/ares_expand_string.c
@@ -17,6 +17,9 @@
 
 #include "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/ares_mkquery.c b/ares/ares_mkquery.c
index a9c9187f7755f2781f8e08b5298af2190b6edd0d..27ec1ee1b072865e10da806907e6494860b5c94a 100644 (file)
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -17,6 +17,9 @@
 
 #include "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/ares_query.c b/ares/ares_query.c
index 14a0d66bca6acaa650f0660e9dbfbf061490716f..0d1f0368107b8d8b119491281cad08518aea776b 100644 (file)
--- a/ares/ares_query.c
+++ b/ares/ares_query.c
@@ -17,6 +17,9 @@
 
 #include "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/ares_send.c b/ares/ares_send.c
index be5478df2d4ac6682378821e286f6cbabecfe8b4..54e4861852c36c23e7f7f15d1778fa52a1959c52 100644 (file)
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -17,6 +17,9 @@
 
 #include "setup.h"
 
+#ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif