Changeset 1301 for code/trunk/src/util

Timestamp:

May 15, 2008, 10:10:11 PM (17 years ago)

Author:

rgrieder

Message:

• see previous message- changed sleep macros to inline functions (caused problem when declaring a function sleep(…) like in boost thread..)

File:

• code/trunk/src/util/Sleep.h (modified) (1 diff)

code/trunk/src/util/Sleep.h

@@ -35 +35 @@
 
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
 #  include <windows.h>
-#  define usleep(x) Sleep((x) / 1000)
-#  define msleep(x) Sleep(x)
-#  define  sleep(x) Sleep((x) * 1000)
+inline void usleep(DWORD dwMicroseconds)
+{
+  Sleep(dwMicroseconds / 1000);
+}
+inline void msleep(DWORD dwMilliseconds)
+{
+  Sleep(dwMilliseconds);
+}
+inline void sleep(DWORD dwSeconds)
+{
+  Sleep(dwSeconds * 1000);
+}
 #else
 #  include <unistd.h>
-#  define msleep(x) uleep((x) * 1000)
+inline void msleep(unsigned long msec)
+{
+  usleep(msec * 1000);
+}
 #endif