From f33f8eee2665cfda72a2aaca25f84738ca1f56dd Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Sat, 29 Nov 2008 00:26:07 +0000 Subject: [PATCH] Make sure sys/socket.h is included before netinet/in.h (required by OpenWatcom C) --- ares/ares.h | 2 +- ares/ares_expand_name.c | 3 +++ ares/ares_expand_string.c | 3 +++ ares/ares_mkquery.c | 3 +++ ares/ares_query.c | 3 +++ ares/ares_send.c | 3 +++ 6 files changed, 16 insertions(+), 1 deletion(-) 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 # include #else - #include #include + #include #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 +#endif #ifdef HAVE_NETINET_IN_H # include #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 +#endif #ifdef HAVE_NETINET_IN_H # include #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 +#endif #ifdef HAVE_NETINET_IN_H # include #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 +#endif #ifdef HAVE_NETINET_IN_H # include #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 +#endif #ifdef HAVE_NETINET_IN_H # include #endif