diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-02-11 14:17:42 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-02-11 14:17:42 +0100 |
| commit | 128ba0f9c18314643de915f48117f6632c58dd2c (patch) | |
| tree | 5261e37dcc2e9d6ed9fbadc7cd952f375f3434fd /cpp | |
| parent | minor fixes to iceserviceinstall usage message (diff) | |
| download | ice-128ba0f9c18314643de915f48117f6632c58dd2c.tar.bz2 ice-128ba0f9c18314643de915f48117f6632c58dd2c.tar.xz ice-128ba0f9c18314643de915f48117f6632c58dd2c.zip | |
Fix for bug 2665
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/INSTALL.WINDOWS | 3 | ||||
| -rwxr-xr-x | cpp/demo/IcePatch2/MFC/stdafx.h | 4 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 10 |
3 files changed, 10 insertions, 7 deletions
diff --git a/cpp/INSTALL.WINDOWS b/cpp/INSTALL.WINDOWS index 93f01019c54..63590f1c4df 100644 --- a/cpp/INSTALL.WINDOWS +++ b/cpp/INSTALL.WINDOWS @@ -28,7 +28,8 @@ Ice has been extensively tested on: - Windows 2003 Server x86 and x64 - Windows Vista x86 -Ice may work on Windows 2000; however we did not test on this platform. +Ice does not work on Windows 2000; however porting Ice to Windows 2000 +should be fairly simple if you do not require UDP multicast or IPv6. There are several Ice binary distributions available for Windows, each built with a different C++ compiler. These distributions can be diff --git a/cpp/demo/IcePatch2/MFC/stdafx.h b/cpp/demo/IcePatch2/MFC/stdafx.h index 4d8823b0936..aaef3805f37 100755 --- a/cpp/demo/IcePatch2/MFC/stdafx.h +++ b/cpp/demo/IcePatch2/MFC/stdafx.h @@ -27,11 +27,11 @@ // Modify the following defines if you have to target a platform prior to the ones specified below. // Refer to MSDN for the latest info on corresponding values for different platforms. #ifndef WINVER // Allow use of features specific to Windows 95 and Windows NT 4 or later. -#define WINVER 0x0400 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later. +#define WINVER 0x0500 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later. #endif #ifndef _WIN32_WINNT // Allow use of features specific to Windows NT 4 or later. -#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later. +#define _WIN32_WINNT 0x0500 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later. #endif #if 0 diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 5b325886718..41bbcd39a57 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -99,11 +99,13 @@ # ifndef _WIN32_WINNT // - // Necessary for TryEnterCriticalSection and some IPv6 macros used in Network.cpp + // Necessary for TryEnterCriticalSection (see IceUtil/Mutex.h). // -# define _WIN32_WINNT 0x0500 -# elif _WIN32_WINNT < 0x0500 -# error "Ice requires headers for Windows 2000 or later." +# 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)) |