[openrtm-commit:01435] r2561 - trunk/OpenRTM-aist/src/lib/coil/win32/coil

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-04-17 00:11:39 +0900 (Thu, 17 Apr 2014)
New Revision: 2561

Modified:
   trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
Log:
[compat,build,win32,->RELENG_1_1] NTDDI_VERSION issue.


Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp	2014-04-16 14:49:17 UTC (rev 2560)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp	2014-04-16 15:11:39 UTC (rev 2561)
@@ -20,10 +20,13 @@
 #ifndef NTDDI_VERSION
 #define NTDDI_VERSION 0x05000000
 #define WINVER _WIN32_WINNT
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif // _WIN32_WINNT
 #define _WIN32_WINNT 0x0500
 #define _WIN32_WINDOWS _WIN32_WINNT
 #define _WIN32_IE 0x0501
-#endif
+#endif // NTDDI_VERSION
 
 #include <winsock2.h>
 #include <ws2tcpip.h>