From 287e875ca971a0e153be9d733485ed5cd50dca07 Mon Sep 17 00:00:00 2001
From: "bryner%brianryner.com" <bryner%brianryner.com>
Date: Fri, 25 Aug 2006 17:38:33 +0000
Subject: [PATCH] Set FORCE_PR_LOG for this entire directory, if MOZ_LOGGING is
 defined (bug 347686) r=marria

---
 extensions/metrics/src/Makefile.in              | 5 +++++
 extensions/metrics/src/nsLoadCollector.cpp      | 5 -----
 extensions/metrics/src/nsMetricsService.cpp     | 5 -----
 extensions/metrics/src/nsMetricsService.h       | 5 -----
 extensions/metrics/src/nsProfileCollector.cpp   | 5 -----
 extensions/metrics/src/nsUICommandCollector.cpp | 5 -----
 6 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/extensions/metrics/src/Makefile.in b/extensions/metrics/src/Makefile.in
index 60d7c4c8519..18a8cb9ea01 100644
--- a/extensions/metrics/src/Makefile.in
+++ b/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
diff --git a/extensions/metrics/src/nsLoadCollector.cpp b/extensions/metrics/src/nsLoadCollector.cpp
index 2ffee314b08..9c374ff504f 100644
--- a/extensions/metrics/src/nsLoadCollector.cpp
+++ b/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"
diff --git a/extensions/metrics/src/nsMetricsService.cpp b/extensions/metrics/src/nsMetricsService.cpp
index c26566cb79d..fcf327d280b 100644
--- a/extensions/metrics/src/nsMetricsService.cpp
+++ b/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"
diff --git a/extensions/metrics/src/nsMetricsService.h b/extensions/metrics/src/nsMetricsService.h
index 711bd603d44..ca6c2bce1b9 100644
--- a/extensions/metrics/src/nsMetricsService.h
+++ b/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"
diff --git a/extensions/metrics/src/nsProfileCollector.cpp b/extensions/metrics/src/nsProfileCollector.cpp
index 716c57f010e..c1e022d74ba 100644
--- a/extensions/metrics/src/nsProfileCollector.cpp
+++ b/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"
diff --git a/extensions/metrics/src/nsUICommandCollector.cpp b/extensions/metrics/src/nsUICommandCollector.cpp
index c85a1bdd7ad..6d6dd53dac2 100644
--- a/extensions/metrics/src/nsUICommandCollector.cpp
+++ b/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"