summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2007-09-17 19:21:47 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2007-09-17 19:21:47 (GMT)
commit9cbb9987371627841a8c508c0880f901a78e844a (patch)
treec95234acf6875f463574ac782048602a49accf52 /Utilities
parent1d81cf994a85ddc0cc6c0626928c33cb8d94ea6d (diff)
downloadCMake-9cbb9987371627841a8c508c0880f901a78e844a.zip
CMake-9cbb9987371627841a8c508c0880f901a78e844a.tar.gz
CMake-9cbb9987371627841a8c508c0880f901a78e844a.tar.bz2
ENH: add support for vs 2008 beta 2
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmcurl/CMake/CurlTests.c5
-rw-r--r--Utilities/cmcurl/Platforms/WindowsCache.cmake1
-rw-r--r--Utilities/cmcurl/select.h7
3 files changed, 6 insertions, 7 deletions
diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c
index fed3894..c5ba7c2 100644
--- a/Utilities/cmcurl/CMake/CurlTests.c
+++ b/Utilities/cmcurl/CMake/CurlTests.c
@@ -306,9 +306,12 @@ gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL);
}
#endif
#ifdef HAVE_SOCKLEN_T
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#else
#include <sys/types.h>
#include <sys/socket.h>
-
+#endif
int
main ()
{
diff --git a/Utilities/cmcurl/Platforms/WindowsCache.cmake b/Utilities/cmcurl/Platforms/WindowsCache.cmake
index 1e115c1..b4515ce 100644
--- a/Utilities/cmcurl/Platforms/WindowsCache.cmake
+++ b/Utilities/cmcurl/Platforms/WindowsCache.cmake
@@ -106,7 +106,6 @@ IF(NOT UNIX)
SET(TIME_WITH_SYS_TIME 0)
SET(HAVE_O_NONBLOCK 0)
SET(HAVE_IN_ADDR_T 0)
- SET(HAVE_SOCKLEN_T 0)
SET(HAVE_INET_NTOA_R_DECL 0)
SET(HAVE_INET_NTOA_R_DECL_REENTRANT 0)
SET(HAVE_GETADDRINFO 0)
diff --git a/Utilities/cmcurl/select.h b/Utilities/cmcurl/select.h
index e0844b1..7573b1f 100644
--- a/Utilities/cmcurl/select.h
+++ b/Utilities/cmcurl/select.h
@@ -25,12 +25,8 @@
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
-#elif defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
-/* for Vista, use WSAPoll(). */
-#include <winsock2.h>
-#define CURL_HAVE_WSAPOLL
#else
-
+#ifndef POLLIN
#define POLLIN 0x01
#define POLLPRI 0x02
#define POLLOUT 0x04
@@ -44,6 +40,7 @@ struct pollfd
short events;
short revents;
};
+#endif
#endif