Index: /trunk/include/iprt/critsect.h
===================================================================
--- /trunk/include/iprt/critsect.h	(revision 36491)
+++ /trunk/include/iprt/critsect.h	(revision 36492)
@@ -4,5 +4,5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -333,5 +333,5 @@
 
 /* Lock strict build: Remap the three enter calls to the debug versions. */
-#if defined(RT_LOCK_STRICT) && !defined(CRITSECT_WITHOUT_REMAPPING) && !defined(RT_WITH_MANGLING)
+#if defined(RT_LOCK_STRICT) && !defined(RTCRITSECT_WITHOUT_REMAPPING) && !defined(RT_WITH_MANGLING)
 # ifdef ___iprt_asm_h
 #  define RTCritSectEnter(pCritSect)                        RTCritSectEnterDebug(pCritSect, (uintptr_t)ASMReturnAddress(), RT_SRC_POS)
@@ -346,5 +346,5 @@
 
 /* Strict lock order: Automatically classify locks by init location. */
-#if defined(RT_LOCK_STRICT_ORDER) && defined(IN_RING3) && !defined(CRITSECT_WITHOUT_REMAPPING) &&!defined(RT_WITH_MANGLING)
+#if defined(RT_LOCK_STRICT_ORDER) && defined(IN_RING3) && !defined(RTCRITSECT_WITHOUT_REMAPPING) &&!defined(RT_WITH_MANGLING)
 # define RTCritSectInit(pCritSect) \
     RTCritSectInitEx((pCritSect), 0 /*fFlags*/, \
Index: /trunk/src/VBox/Runtime/generic/critsect-generic.cpp
===================================================================
--- /trunk/src/VBox/Runtime/generic/critsect-generic.cpp	(revision 36491)
+++ /trunk/src/VBox/Runtime/generic/critsect-generic.cpp	(revision 36492)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29,5 +29,5 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#define CRITSECT_WITHOUT_REMAPPING
+#define RTCRITSECT_WITHOUT_REMAPPING
 #include <iprt/critsect.h>
 #include "internal/iprt.h"
Index: /trunk/src/VBox/Runtime/testcase/tstRTCritSect.cpp
===================================================================
--- /trunk/src/VBox/Runtime/testcase/tstRTCritSect.cpp	(revision 36491)
+++ /trunk/src/VBox/Runtime/testcase/tstRTCritSect.cpp	(revision 36492)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31,5 +31,5 @@
 # include <Windows.h>
 #endif
-#define CRITSECT_WITHOUT_REMAPPING
+#define RTCRITSECT_WITHOUT_REMAPPING
 #include <iprt/critsect.h>