diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-08-09 15:40:44 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-08-09 15:40:44 -0400 |
| commit | 87ae1f009ce03d18e459ad8d66050da9a9f63144 (patch) | |
| tree | 40118e7d5f3ce44688de309d6c8c4e13a26b6ac3 /cpp/src/Ice/Network.cpp | |
| parent | WinRT Endpoint fixes for encoding11 (diff) | |
| download | ice-87ae1f009ce03d18e459ad8d66050da9a9f63144.tar.bz2 ice-87ae1f009ce03d18e459ad8d66050da9a9f63144.tar.xz ice-87ae1f009ce03d18e459ad8d66050da9a9f63144.zip | |
Added native cond-var implementation on Windows (bug #2667)
for Visual Studio 2012 and up
Removed all #define and checks for _WIN32_WINNT (no longer needed)
Misc build fixes for Visual Studio
IceUtil/Config.h cleanup (minor)
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index e4678b96502..1258fa186a9 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -17,14 +17,6 @@ # include <netinet/in.h> #endif -// -// The following is required for the Vista PSDK to bring in -// the definitions of the IN6_IS_ADDR_* macros. -// -#if defined(_WIN32) && !defined(_WIN32_WINNT) && WINAPI_FAMILY != 0x02 -# define _WIN32_WINNT 0x0501 -#endif - #include <Ice/Network.h> #include <IceUtil/StringUtil.h> #include <IceUtil/Unicode.h> |