Set FORCE_PR_LOG for this entire directory, if MOZ_LOGGING is defined (bug 347686) r=marria

extensions/metrics/src/Makefile.in

@@ -111,6 +111,11 @@ EXTRA_DSO_LDOPTS += -NODEFAULTLIB:MSVCRT \
 		    $(NULL)
 endif
 
+# Enable logging in release builds
+ifneq (,$(findstring -DMOZ_LOGGING=1, $(ACDEFINES)))
+DEFINES += -DFORCE_PR_LOG
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 export:: $(topsrcdir)/security/nss/lib/freebl/md5.c

extensions/metrics/src/nsLoadCollector.cpp

@@ -36,11 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// This must be before any #includes to enable logging in release builds
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-
 #include "nsLoadCollector.h"
 #include "nsMetricsService.h"
 #include "nsCOMPtr.h"

extensions/metrics/src/nsMetricsService.cpp

@@ -36,11 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// This must be before any #includes to enable logging in release builds
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-
 #include "nsMetricsService.h"
 #include "nsMetricsEventItem.h"
 #include "nsIMetricsCollector.h"

extensions/metrics/src/nsMetricsService.h

@@ -39,11 +39,6 @@
 #ifndef nsMetricsService_h__
 #define nsMetricsService_h__
 
-// This must be before any #includes to enable logging in release builds
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-
 #include "nsIMetricsService.h"
 #include "nsMetricsModule.h"
 #include "nsMetricsConfig.h"

extensions/metrics/src/nsProfileCollector.cpp

@@ -36,11 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// This must be before any #includes to enable logging in release builds
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-
 #include "nsProfileCollector.h"
 #include "nsMetricsService.h"
 #include "prsystem.h"

extensions/metrics/src/nsUICommandCollector.cpp

@@ -36,11 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// This must be before any #includes to enable logging in release builds
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-
 #include "nsUICommandCollector.h"
 #include "nsMetricsService.h"