aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2008-11-29 00:26:07 +0000
committerDan Fandrich <dan@coneharvesters.com>2008-11-29 00:26:07 +0000
commitf33f8eee2665cfda72a2aaca25f84738ca1f56dd (patch)
treee73fd479218a0bd08c7357ef6d271edb2823e22a
parent31a3f064c03bd1faed5c54d21edb6bd40a73a7ab (diff)
Make sure sys/socket.h is included before netinet/in.h (required by
OpenWatcom C)
-rw-r--r--ares/ares.h2
-rw-r--r--ares/ares_expand_name.c3
-rw-r--r--ares/ares_expand_string.c3
-rw-r--r--ares/ares_mkquery.c3
-rw-r--r--ares/ares_query.c3
-rw-r--r--ares/ares_send.c3
6 files changed, 16 insertions, 1 deletions
diff --git a/ares/ares.h b/ares/ares.h
index 7ea70543f..e2c7f4c05 100644
--- 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 dc5b10753..8a9d82215 100644
--- 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 ead60a407..f2d4f748a 100644
--- 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 a9c9187f7..27ec1ee1b 100644
--- 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 14a0d66bc..0d1f03681 100644
--- 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 be5478df2..54e486185 100644
--- 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