From: Yang Tse Date: Tue, 18 Dec 2007 18:08:19 +0000 (+0000) Subject: MSVC 9.0 (VS2008) does not support Windows build targets prior to WinXP, X-Git-Tag: curl-7_18_0~145 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07a1857d59e2da6d57eb622e90822ffa4835e1de;p=thirdparty%2Fcurl.git MSVC 9.0 (VS2008) does not support Windows build targets prior to WinXP, and makes wrong asumptions of build target when it isn't specified. So, if no build target has been defined we will target WinXP when building with MSVC 9.0 (VS2008). --- diff --git a/CHANGES b/CHANGES index a6b80f60e8..62cc18a27c 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,12 @@ Changelog +Yang Tse (18 Dec 2007) +- MSVC 9.0 (VS2008) does not support Windows build targets prior to WinXP, + and makes wrong asumptions of build target when it isn't specified. So, + if no build target has been defined we will target WinXP when building + curl/libcurl with MSVC 9.0 (VS2008). + Daniel S (17 Dec 2007) - 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 diff --git a/ares/config-win32.h b/ares/config-win32.h index 257a984514..854143d55a 100644 --- a/ares/config-win32.h +++ b/ares/config-win32.h @@ -169,6 +169,20 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif +/* VS2008 does not support Windows build targets prior to WinXP, */ +/* so, if no build target has been defined we will target WinXP. */ +#if defined(_MSC_VER) && (_MSC_VER >= 1500) +# ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0501 +# endif +# ifndef WINVER +# define WINVER 0x0501 +# endif +# if (_WIN32_WINNT < 0x0501) || (WINVER < 0x0501) +# error VS2008 does not support Windows build targets prior to WinXP +# endif +#endif + /* ---------------------------------------------------------------- */ /* IPV6 COMPATIBILITY */ /* ---------------------------------------------------------------- */ diff --git a/lib/config-win32.h b/lib/config-win32.h index 97db859b9c..8e57b14547 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -353,6 +353,20 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif +/* VS2008 does not support Windows build targets prior to WinXP, */ +/* so, if no build target has been defined we will target WinXP. */ +#if defined(_MSC_VER) && (_MSC_VER >= 1500) +# ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0501 +# endif +# ifndef WINVER +# define WINVER 0x0501 +# endif +# if (_WIN32_WINNT < 0x0501) || (WINVER < 0x0501) +# error VS2008 does not support Windows build targets prior to WinXP +# endif +#endif + /* ---------------------------------------------------------------- */ /* LDAP SUPPORT */ /* ---------------------------------------------------------------- */ diff --git a/src/config-win32.h b/src/config-win32.h index 940dbf064f..e6c42e5015 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -187,6 +187,20 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif +/* VS2008 does not support Windows build targets prior to WinXP, */ +/* so, if no build target has been defined we will target WinXP. */ +#if defined(_MSC_VER) && (_MSC_VER >= 1500) +# ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0501 +# endif +# ifndef WINVER +# define WINVER 0x0501 +# endif +# if (_WIN32_WINNT < 0x0501) || (WINVER < 0x0501) +# error VS2008 does not support Windows build targets prior to WinXP +# endif +#endif + /* ---------------------------------------------------------------- */ /* ADDITIONAL DEFINITIONS */ /* ---------------------------------------------------------------- */