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

OpenWatcom C)
16 years ago · b4371466d4
parent 7bd83c2e33
commit b4371466d4
6 changed files with 16 additions and 1 deletions
--- a/ares.h
+++ b/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
--- a/ares_expand_name.c
+++ b/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
--- a/ares_expand_string.c
+++ b/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
--- a/ares_mkquery.c
+++ b/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
--- a/ares_query.c
+++ b/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
--- a/ares_send.c
+++ b/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