[openrtm-commit:01433] r2559 - in trunk/OpenRTM-aist/src/lib/coil: common win32/coil

openrtm @ openrtm.org openrtm @ openrtm.org
2014年 4月 16日 (水) 12:24:24 JST


Author: n-ando
Date: 2014-04-16 12:24:24 +0900 (Wed, 16 Apr 2014)
New Revision: 2559

Modified:
   trunk/OpenRTM-aist/src/lib/coil/common/stringutil.h
   trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
Log:
[compat,win32,->RELENG_1_1] additional include <stdint> and NTDDI_VERSION definition added.

Modified: trunk/OpenRTM-aist/src/lib/coil/common/stringutil.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/common/stringutil.h	2014-04-10 15:51:05 UTC (rev 2558)
+++ trunk/OpenRTM-aist/src/lib/coil/common/stringutil.h	2014-04-16 03:24:24 UTC (rev 2559)
@@ -23,8 +23,11 @@
 #include <string>
 #include <vector>
 #include <sstream>
+
+#if defined (_MSC_VER) && (_MSC_VER <=1500) // VC2008(VC9.0) or before
+#else
 #include <stdint.h>
-
+#endif
 // Cygwin's gcc does not provide wstring type
 #if defined(Cygwin) && ( __GNUC__ < 4 )
 namespace std

Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp	2014-04-10 15:51:05 UTC (rev 2558)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp	2014-04-16 03:24:24 UTC (rev 2559)
@@ -17,6 +17,9 @@
  *
  */
 
+#ifndef NTDDI_VERSION
+#define NTDDI_VERSION 0x05000000
+#endif
 
 #include <winsock2.h>
 #include <ws2tcpip.h>



More information about the openrtm-commit mailing list