Index: /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp
===================================================================
--- /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 38036)
+++ /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 38037)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20,5 +20,5 @@
 *   Header Files                                                               *
 *******************************************************************************/
-/* #define LOG_ENABLED */
+
 /* Enable dev_vmm Log3 statements to get IRQ-related logging. */
 
Index: /trunk/src/VBox/Frontends/VBoxFB/VBoxFB.h
===================================================================
--- /trunk/src/VBox/Frontends/VBoxFB/VBoxFB.h	(revision 38036)
+++ /trunk/src/VBox/Frontends/VBoxFB/VBoxFB.h	(revision 38037)
@@ -6,5 +6,5 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19,7 +19,4 @@
 #ifndef __H_VBOXFB
 #define __H_VBOXFB
-
-// release logging
-#define LOG_ENABLED
 
 #include <stdlib.h>
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 38036)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 38037)
@@ -210,5 +210,4 @@
 	$(if $(VBOX_WITH_COCOA_QT),VBOX_WITH_COCOA_QT,) \
 	$(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
-	$(if $(VBOX_MAIN_RELEASE_LOG),VBOX_MAIN_RELEASE_LOG LOG_ENABLED,) \
 	$(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
 	$(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
@@ -571,5 +570,4 @@
 	$(if $(VBOX_WITH_VRDP_VIDEO_CHANNEL),VBOX_WITH_VRDP_VIDEO_CHANNEL,) \
 	$(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
-	$(if $(VBOX_MAIN_RELEASE_LOG),VBOX_MAIN_RELEASE_LOG LOG_ENABLED,) \
 	$(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
 	$(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
Index: /trunk/src/VBox/Main/include/Logging.h
===================================================================
--- /trunk/src/VBox/Main/include/Logging.h	(revision 38036)
+++ /trunk/src/VBox/Main/include/Logging.h	(revision 38037)
@@ -42,11 +42,4 @@
 #endif
 
-/* Ensure log macros are enabled if release logging is requested */
-#if defined (VBOX_MAIN_RELEASE_LOG) && !defined (DEBUG)
-# ifndef LOG_ENABLED
-#  define LOG_ENABLED
-# endif
-#endif
-
 #include <VBox/log.h>
 
Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 38036)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 38037)
@@ -218,7 +218,4 @@
 ifdef IPRT_WITH_KSTUFF
  RuntimeR3_DEFS        += LDR_WITH_KLDR
-endif
-ifdef VBOX_MAIN_RELEASE_LOG ## @todo (dmik): temporary, until RTThreadSelf/RTThreadAdopt are properly updated
- RuntimeR3_DEFS        += RTCRITSECT_STRICT
 endif
 ifdef IPRT_WITH_LZJB