Changeset 376 for trunk/src/core/time.cc

Timestamp:

05/28/15 10:21:10 (10 years ago)

Author:

epyon

Message:

• stl/assert.hh, stl/capi.hh, size_t independent
• GCC 4.8 compatibility
• using template usage
• various minor changes

File:

• trunk/src/core/time.cc (modified) (3 diffs)

trunk/src/core/time.cc

@@ -7 +7 @@
 #include "nv/core/logging.hh"
 
+#include <ctime>
+
 #if NV_COMPILER == NV_MSVC
 #define WIN32_LEAN_AND_MEAN 
@@ -13 +15 @@
 #pragma intrinsic(__rdtsc)
 #else
-#include <unistd.h>
+#if NV_COMPILER == NV_GNUC && NV_PLATFORM == NV_WINDOWS
+// mingw doesn't have usleep nor nanosleep...
+#include <windows.h>
+#endif
+// #include <unistd.h>
+// #include <time.h>
+// #include <sys/time.h>
+// #include <sys/types.h>
+#include <stdio.h> 
+#include <time.h> 
 #include <sys/time.h>
 #endif
 
-#include <ctime>
+
 
 struct timer_impl
@@ -58 +69 @@
         Sleep( ms );
 #else
-        usleep( ms * 1000 );
+#if NV_COMPILER == NV_GNUC && NV_PLATFORM == NV_WINDOWS
+        Sleep( ms );
+#else
+        struct timespec ts;
+        ts.tv_sec = 0;
+        ts.tv_nsec = ms * 1000000;
+        nanosleep(&ts, NULL);
+//      usleep( ms * 1000 );
+#endif
 #endif
 }