From f4ffa85f6061c07b80911daa6dc8c51be9c7bd4c Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 18 Dec 2007 10:36:32 +0000 Subject: [PATCH] pollfd struct and WSA_poll fixes for Windows Vista already present in CVS --- CHANGES | 11 ++++++++--- RELEASE-NOTES | 4 ++-- lib/config-win32.h | 8 -------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index fc26cd0..a6b80f6 100644 --- a/CHANGES +++ b/CHANGES @@ -8,9 +8,9 @@ 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. +- Mateusz Loskot pointed out that MSVC 9.0 (VS2008) has the pollfd struct and + defines in winsock2.h somehow differently than previous versions and that + curl 7.17.1 would fail to compile out of the box. Daniel S (13 Dec 2007) - David Wright filed bug report #1849764 @@ -168,6 +168,11 @@ Daniel S (12 Nov 2007) make sure that there's never any chance for a NULL pointer in that struct member. +Yang Tse (10 Nov 2007) +- Vikram Saxena (http://curl.haxx.se/mail/lib-2007-11/0096.html) pointed out + that the pollfd struct was being multi defined when using VS2008. This is + now fixed in /curl/lib/select.h + Daniel S (8 Nov 2007) - Bug report #1823487 (http://curl.haxx.se/bug/view.cgi?id=1823487) pointed out that SFTP requests didn't use persistent connections. Neither did SCP diff --git a/RELEASE-NOTES b/RELEASE-NOTES index cad0468..fb09eba 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -36,7 +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) + o build fix for MSVC 9.0 (VS2008) This release includes the following known bugs: @@ -57,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, Mateusz Loskot + Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot Thanks! (and sorry if I forgot to mention someone) diff --git a/lib/config-win32.h b/lib/config-win32.h index 144ffe9..97db859 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -353,14 +353,6 @@ #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 */ /* ---------------------------------------------------------------- */ -- 2.7.4