Changeset 6912 for trunk/include/odinwrap.h

Timestamp:

Oct 1, 2001, 3:30:13 AM (24 years ago)

Author:

bird

Message:

Watcom: GetCurrentThreadId workaround. () -> (void).

File:

• trunk/include/odinwrap.h (modified) (4 diffs)

trunk/include/odinwrap.h

@@ -57 +57 @@
 
 // ---------------------------------------------------------------------------
-extern unsigned long int WIN32API GetCurrentThreadId();     // kernel32
-extern unsigned long int WIN32API dbg_GetThreadCallDepth(); // kernel32
-extern void              WIN32API dbg_IncThreadCallDepth(); // kernel32
-extern void              WIN32API dbg_DecThreadCallDepth(); // kernel32
+#ifdef __WATCOMC__
+//this doens't work with watcom because doubly declared somewhere :-(
+//extern unsigned long int WIN32API GetCurrentThreadId(void);     // kernel32
+#else
+extern unsigned long int WIN32API GetCurrentThreadId(void);     // kernel32
+#endif
+extern unsigned long int WIN32API dbg_GetThreadCallDepth(void); // kernel32
+extern void              WIN32API dbg_IncThreadCallDepth(void); // kernel32
+extern void              WIN32API dbg_DecThreadCallDepth(void); // kernel32
 
 // ---------------------------------------------------------------------------
@@ -81 +86 @@
      unsigned long ulElapsed;     \
      QueryPerformanceCounter(&liStart);
-  
-  
+
+
 #  define PROFILE_STOP(a)            \
      QueryPerformanceCounter(&liEnd);\
@@ -114 +119 @@
     dprintf(("WARNING: FS: for thread %08xh corrupted by "a, GetCurrentThreadId())); \
   }
-  
-  
+
+
 /****************************************************************************
  * General Wrapper Macros (debug instrumented)                              *
@@ -706 +711 @@
 
 #define FNPROLOGUE(a)   \
-  USHORT sel = GetFS(); 
+  USHORT sel = GetFS();
 
 #define FNEPILOGUE(a)   \