Index: /trunk/src/VBox/Runtime/log.cpp
===================================================================
--- /trunk/src/VBox/Runtime/log.cpp	(revision 407)
+++ /trunk/src/VBox/Runtime/log.cpp	(revision 408)
@@ -112,9 +112,9 @@
 {
     /** The thread. */
-    RTTHREAD volatile   Thread;
+    RTNATIVETHREAD volatile NativeThread;
     /** The (process / session) key. */
-    uintptr_t volatile  uKey;
+    uintptr_t volatile      uKey;
     /** The logger instance.*/
-    PRTLOGGER volatile  pLogger;
+    PRTLOGGER volatile      pLogger;
 }                                   g_aPerThreadLoggers[8];
 #endif /* IN_RING0 */
@@ -1250,8 +1250,8 @@
     if (g_cPerThreadLoggers)
     {
-        const RTTHREAD Self = RTThreadSelf();
+        const RTNATIVETHREAD Self = RTThreadNativeSelf();
         int32_t i = ELEMENTS(g_aPerThreadLoggers);
         while (i-- > 0)
-            if (g_aPerThreadLoggers[i].Thread == Self)
+            if (g_aPerThreadLoggers[i].NativeThread == Self)
                 return g_aPerThreadLoggers[i].pLogger;
     }
@@ -1281,6 +1281,6 @@
 RTDECL(int) RTLogSetDefaultInstanceThread(PRTLOGGER pLogger, uintptr_t uKey)
 {
-    int         rc;
-    RTTHREAD    Self = RTThreadSelf();
+    int             rc;
+    RTNATIVETHREAD  Self = RTThreadNativeSelf();
     if (pLogger)
     {
@@ -1292,5 +1292,5 @@
         int32_t i = ELEMENTS(g_aPerThreadLoggers);
         while (i-- > 0)
-            if (g_aPerThreadLoggers[i].Thread == Self)
+            if (g_aPerThreadLoggers[i].NativeThread == Self)
             {
                 ASMAtomicXchgPtr((void * volatile *)&g_aPerThreadLoggers[i].uKey, (void *)uKey);
@@ -1314,7 +1314,7 @@
             while (i-- > 0)
             {
-                AssertCompile(sizeof(RTTHREAD) == sizeof(void*));
-                if (    g_aPerThreadLoggers[i].Thread == NIL_RTTHREAD
-                    &&  ASMAtomicCmpXchgPtr((void * volatile *)&g_aPerThreadLoggers[i].Thread, Self, NIL_RTTHREAD))
+                AssertCompile(sizeof(RTNATIVETHREAD) == sizeof(void*));
+                if (    g_aPerThreadLoggers[i].NativeThread == NIL_RTTHREAD
+                    &&  ASMAtomicCmpXchgPtr((void * volatile *)&g_aPerThreadLoggers[i].NativeThread, (void *)Self, (void *)NIL_RTNATIVETHREAD))
                 {
                     ASMAtomicXchgPtr((void * volatile *)&g_aPerThreadLoggers[i].uKey, (void *)uKey);
@@ -1335,10 +1335,10 @@
         int32_t i = ELEMENTS(g_aPerThreadLoggers);
         while (i-- > 0)
-            if (    g_aPerThreadLoggers[i].Thread == Self
+            if (    g_aPerThreadLoggers[i].NativeThread == Self
                 ||  g_aPerThreadLoggers[i].uKey == uKey)
             {
                 ASMAtomicXchgPtr((void * volatile *)&g_aPerThreadLoggers[i].uKey, NULL);
                 ASMAtomicXchgPtr((void * volatile *)&g_aPerThreadLoggers[i].pLogger, NULL);
-                ASMAtomicXchgPtr((void * volatile *)&g_aPerThreadLoggers[i].Thread, NIL_RTTHREAD);
+                ASMAtomicXchgPtr((void * volatile *)&g_aPerThreadLoggers[i].NativeThread, (void *)NIL_RTNATIVETHREAD);
                 ASMAtomicDecS32(&g_cPerThreadLoggers);
             }