diff options
Diffstat (limited to 'cpp/include/IceUtil/Config.h')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 62a06dd5b0d..41bbcd39a57 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -97,15 +97,15 @@ #if defined(_WIN32) -// -// Comment out the following block if you want to run on Windows 9x -// or Windows NT 3.51. -// # ifndef _WIN32_WINNT // - // Necessary for TryEnterCriticalSection. + // Necessary for TryEnterCriticalSection (see IceUtil/Mutex.h). // -# define _WIN32_WINNT 0x0400 +# if defined(_MSC_VER) && _MSC_VER < 1500 +# define _WIN32_WINNT 0x0400 +# endif +# elif _WIN32_WINNT < 0x0400 +# error "TryEnterCricalSection requires _WIN32_WINNT >= 0x0400" # endif # if !defined(ICE_STATIC_LIBS) && defined(_MSC_VER) && (!defined(_DLL) || !defined(_MT)) @@ -130,6 +130,13 @@ // ...: decorated name length exceeded, name was truncated # pragma warning( disable : 4503 ) # endif + + // + // For STLport. Define _STLP_NEW_PLATFORM_SDK if a PSDK newer than the PSDK included with VC6. + // +# if !defined(_STLP_NEW_PLATFORM_SDK) && WINVER > 0x0400 +# define _STLP_NEW_PLATFORM_SDK 1 +# endif #endif // |