aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-04-03 20:54:37 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-04-03 20:54:37 +0000
commit990b15e40288ad89c423d331b9563d8259284d9c (patch)
treed8a5d199510dc99440fb8d7d10e730393d76bc93
parent584f3639e36f991c0962b9b88165decdc1c8d2c9 (diff)
Rob Jones fixed better #ifdef'ing for a bunch of #include lines.
-rw-r--r--CHANGES3
-rw-r--r--RELEASE-NOTES2
-rw-r--r--lib/easy.c6
-rw-r--r--lib/http.c4
-rw-r--r--lib/transfer.c2
-rw-r--r--lib/url.c8
6 files changed, 24 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 3439ceae8..0fdf27eca 100644
--- 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 084dc6ceb..fce974d23 100644
--- 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 cdd3570a2..6195d21e3 100644
--- 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 187c0a43d..884d7e3d2 100644
--- 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 c6a6f094c..a7b3a724d 100644
--- 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 60fe028fb..0ae0197d3 100644
--- 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>