aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-12-17 21:19:42 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-12-17 21:19:42 +0000
commitbcd7d03b3b814b0fc3e052819ed7d84946e846e5 (patch)
tree3bd7b2bb3921c81e7454719e02de0a1ba2b3d05a
parent82c9379b6ce4c041045b03ef144ce578976543a3 (diff)
Mateusz Loskot pointed out that VC++ 9.0 (2008) has the pollfd struct and
defines in the SDK somehow differently so we have to add a define to the config-win32.h file to make select.h compile nicely.
-rw-r--r--CHANGES5
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/config-win32.h8
3 files changed, 15 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 7921bcb5c..fc26cd036 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,11 @@
Changelog
+Daniel S (17 Dec 2007)
+- Mateusz Loskot pointed out that VC++ 9.0 (2008) has the pollfd struct and
+ defines in the SDK somehow differently so we have to add a define to the
+ config-win32.h file to make select.h compile nicely.
+
Daniel S (13 Dec 2007)
- David Wright filed bug report #1849764
(http://curl.haxx.se/bug/view.cgi?id=1849764) with an included fix. He
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6714b8dcd..cad0468b2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -36,6 +36,7 @@ This release includes the following bugfixes:
o SSL session id caching
o POST with callback over proxy requiring NTLM or Digest
o Expect: 100-continue flaw on re-used connection with POSTs
+ o build fix for VC++ 9.0 (2008)
This release includes the following known bugs:
@@ -56,6 +57,6 @@ advice from friends like these:
Dan Fandrich, Gisle Vanem, Toby Peterson, Yang Tse, Daniel Black,
Robin Johnson, Michal Marek, Ates Goral, Andres Garcia, Rob Crittenden,
Emil Romanus, Alessandro Vesely, Ray Pekowski, Spacen Jasset, Andrew Moise,
- Gilles Blanc, David Wright
+ Gilles Blanc, David Wright, Mateusz Loskot
Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 97db859b9..144ffe97f 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -353,6 +353,14 @@
#define _CRT_NONSTDC_NO_DEPRECATE 1
#endif
+/* Define to make select.h work fine on VC++ 9.0 (2008) */
+#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+/* The poll struct and associated defines are present in the Windows SDK v6.0
+ that comes with this version... */
+#define HAVE_STRUCT_POLLFD 1
+#endif
+
+
/* ---------------------------------------------------------------- */
/* LDAP SUPPORT */
/* ---------------------------------------------------------------- */