[openrtm-commit:02910] r3067 - in trunk/OpenRTM-aist/src/lib/coil: common vxworks/coil

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-11-07 18:52:52 +0900 (Tue, 07 Nov 2017)
New Revision: 3067

Modified:
   trunk/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp
   trunk/OpenRTM-aist/src/lib/coil/vxworks/coil/Time.h
Log:
[compat, VxWorks] fixed bug.

Modified: trunk/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp	2017-11-07 09:43:54 UTC (rev 3066)
+++ trunk/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp	2017-11-07 09:52:52 UTC (rev 3067)
@@ -40,7 +40,7 @@
         return true;
       }
     return false;
-#elif defined(VXWORKS_66) && !defined(__RTP__)
+#elif defined(VXWORKS_66)
     timespec tv;
     tv.tv_sec = clocktime.sec();
     tv.tv_nsec = clocktime.usec()*1000;

Modified: trunk/OpenRTM-aist/src/lib/coil/vxworks/coil/Time.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/vxworks/coil/Time.h	2017-11-07 09:43:54 UTC (rev 3066)
+++ trunk/OpenRTM-aist/src/lib/coil/vxworks/coil/Time.h	2017-11-07 09:52:52 UTC (rev 3067)
@@ -298,7 +298,7 @@
    */
 #if defined(__powerpc__) && !defined(__RTP__)
   int settimeofday(UINT32 s, UINT32 ns);
-#elif defined(VXWORKS_66) && !defined(__RTP__)
+#elif defined(VXWORKS_66)
   inline int settimeofday(struct timespec *tv)
   {
     return ::clock_settime(CLOCK_REALTIME, tv);