Rob Jones fixed better #ifdef'ing for a bunch of #include lines.

diff --git a/CHANGES b/CHANGES
index 3439ceae8784bd178ffc319ad58b807c8b5744c7..0fdf27eca012850ce7a27f01a9aeb74bda43fbfa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel S (3 April 2007)
+- Rob Jones fixed better #ifdef'ing for a bunch of #include lines.
+
 Daniel S (2 April 2007)
 - Nick Zitzmann made the CURLOPT_POSTQUOTE option work for SFTP as well. The
   accepted commands are as follows:

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 084dc6ceb3e4aa9ed132172acd143b81e1a59d33..fce974d23974f2fde8fb67899f83c60e676ed3d2 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -72,6 +72,6 @@ advice from friends like these:
  Michal Marek, Robson Braga Araujo, Ian Turner, Linus Nielsen Feltzing,
  Ravi Pratap, Adam D. Moss, Jose Kahan, Hang Kin Lau, Justin Fletcher,
  Robert Iakobashvili, Bryan Henderson, Eygene Ryabinkin, Daniel Johnson,
- Matt Kraai, Nick Zitzmann
+ Matt Kraai, Nick Zitzmann, Rob Jones
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/easy.c b/lib/easy.c
index cdd3570a23dcd33da58b7b7dfb3abbd35a9261f5..6195d21e30a869e66b0099b2562a94dfc81afa7c 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -40,21 +40,27 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 #include <signal.h>
 
 #ifdef HAVE_SYS_PARAM_H

diff --git a/lib/http.c b/lib/http.c
index 187c0a43d4501381759f0570fa45d01f002b619b..884d7e3d2114d848a248e49bf866046d0b50cc2d 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -54,14 +54,18 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 #include <signal.h>
 
 #ifdef HAVE_SYS_PARAM_H

diff --git a/lib/transfer.c b/lib/transfer.c
index c6a6f094cc4ffb25e8c8142822dcf76767d6f68c..a7b3a724d17e8267192142ad402814ab37293626 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -50,7 +50,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif

diff --git a/lib/url.c b/lib/url.c
index 60fe028fbf20e13cc8d3e21fc3defa0cbafbd566..0ae0197d3ce652f3cac55cf13744c5b21f49ad1c 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -39,22 +39,30 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
+#if HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>