From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 29 Mar 2004 06:22:57 +0000 (+0000)
Subject: netinet/tcp.h may require netinet/in.h to be include before
X-Git-Tag: curl-7_11_2~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d85c21994f849c8ef98152023435622f42b4dc95;p=thirdparty%2Fcurl.git

netinet/tcp.h may require netinet/in.h to be include before
---

diff --git a/configure.ac b/configure.ac
index e188bc900a..ad40ede976 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1038,6 +1038,9 @@ dnl default includes
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
 ]
 )
 
diff --git a/lib/connect.c b/lib/connect.c
index 77bcb56d14..78338de65e 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -32,10 +32,15 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h> /* <netinet/tcp.h> may need it */
+#endif
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h> /* for TCP_NODELAY */
 #endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif