diff options
| author | Mark Spruiell <mes@zeroc.com> | 2003-12-08 17:41:46 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2003-12-08 17:41:46 +0000 |
| commit | b1b7ba7a2a324494ccb81ddbfd43e701ece3bc44 (patch) | |
| tree | bbf9718f71de55cee79cf7a4edd73c1f20188ee8 /cpp/include/IceUtil/Config.h | |
| parent | adding MFC demo (diff) | |
| download | ice-b1b7ba7a2a324494ccb81ddbfd43e701ece3bc44.tar.bz2 ice-b1b7ba7a2a324494ccb81ddbfd43e701ece3bc44.tar.xz ice-b1b7ba7a2a324494ccb81ddbfd43e701ece3bc44.zip | |
Winsock fix
Diffstat (limited to 'cpp/include/IceUtil/Config.h')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index e961bccf101..700ee8be642 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -80,7 +80,6 @@ #if defined(_WIN32) - // // Comment out the following block if you want to run on Windows 9x // or Windows NT 3.51. @@ -92,7 +91,6 @@ # define _WIN32_WINNT 0x0400 # endif - # if !defined(_DLL) || !defined(_MT) # error "Only multi-threaded DLL libraries can be used with Ice!" # endif @@ -114,7 +112,7 @@ // windows.h to skip inclusion of winsock2.h, so we include it here if // necessary. // -# ifndef _WINSOCK2API_ +# if !defined(_WINSOCK2API_) && !defined(_WINSOCKAPI_) # include <winsock2.h> # endif |