aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2009-12-25 23:32:01 +0000
committerDaniel Stenberg <daniel@haxx.se>2009-12-25 23:32:01 +0000
commitb89789d82fdb2df7adc8d00e7574ab0e531c3f7b (patch)
tree4c9c86cd087331f416bf64b90b72aaf1665c7cf7
parenta2182359646f8f7ee457aec75f45e36f016c3b0f (diff)
- Renato Botelho and Peter Pentchev brought a patch that makes the libcurl
headers work correctly even on FreeBSD systems before v8.
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES3
-rw-r--r--include/curl/curl.h7
3 files changed, 12 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 82a9f2d41..275a712e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
Changelog
+Daniel Stenberg (26 Dec 2009)
+- Renato Botelho and Peter Pentchev brought a patch that makes the libcurl
+ headers work correctly even on FreeBSD systems before v8.
+
Daniel Stenberg (17 Dec 2009)
- David Byron fixed Curl_ossl_cleanup to actually call ENGINE_cleanup when
available.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 25ca3a116..04bf6a83a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -36,6 +36,7 @@ This release includes the following bugfixes:
o --retry didn't do right for FTP transient errors
o some *_proxy environment variables didn't function
o libcurl-OpenSSL engine cleanup
+ o header include fix for FreeBSD versions before v8
This release includes the following known bugs:
@@ -48,6 +49,6 @@ advice from friends like these:
Marco Maggi, Camille Moncelier, Claes Jakobsson, Kevin Baughman,
Marc Kleine-Budde, Jad Chamcham, Bjorn Augustsson, David Byron,
Markus Koetter, Chad Monroe, Martin Storsjo, Siegfried Gyuricsko,
- Jon Nelson, Julien Chaffraix
+ Jon Nelson, Julien Chaffraix, Renato Botelho, Peter Pentchev
Thanks! (and sorry if I forgot to mention someone)
diff --git a/include/curl/curl.h b/include/curl/curl.h
index f7c3f52ff..7fc11e340 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -47,6 +47,11 @@
#include <stdio.h>
#include <limits.h>
+#if defined(__FreeBSD__)
+/* Needed to check FreeBSD version */
+#include <osreldate.h>
+#endif
+
/* The include stuff here below is mainly for time_t! */
#include <sys/types.h>
#include <time.h>
@@ -66,7 +71,7 @@
require it! */
#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
- defined(ANDROID)
+ defined(ANDROID) || (defined(__FreeBSD__) && __FreeBSD_version < 800000)
#include <sys/select.h>
#endif