Bug 1163198 - Remove instances of #ifdef PR_LOGGING in dom/plugins. r=froydnj
authorEric Rahm <erahm@mozilla.com>
Mon, 11 May 2015 14:00:02 -0700
changeset 243300 0f061c5d85bee655242a9ea9c55ac0cd3aed5b3e
parent 243299 3026a0345003b62c61371988cb92e48d536ba8f1
child 243301 5eec0168c91685ed54993c1c923c33cad65965d7
push id59643
push usererahm@mozilla.com
push dateMon, 11 May 2015 21:00:19 +0000
treeherdermozilla-inbound@0f061c5d85be [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1163198
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1163198 - Remove instances of #ifdef PR_LOGGING in dom/plugins. r=froydnj PR_LOGGING is now always defined, we can remove #ifdefs checking for it.
dom/plugins/base/nsPluginLogging.h
--- a/dom/plugins/base/nsPluginLogging.h
+++ b/dom/plugins/base/nsPluginLogging.h
@@ -5,18 +5,16 @@
 
 /* Plugin Module Logging usage instructions and includes */
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef nsPluginLogging_h__
 #define nsPluginLogging_h__
 
 #include "prlog.h"
 
-#ifdef PR_LOGGING
-
 #ifndef PLUGIN_LOGGING    // allow external override
 #define PLUGIN_LOGGING 1  // master compile-time switch for pluging logging
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Basic Plugin Logging Usage Instructions
 //
 // 1. Set this environment variable: NSPR_LOG_MODULES=<name>:<level>
@@ -53,18 +51,16 @@ class nsPluginLogging
 public:
   static PRLogModuleInfo* gNPNLog;  // 4.x NP API, calls into navigator
   static PRLogModuleInfo* gNPPLog;  // 4.x NP API, calls into plugin
   static PRLogModuleInfo* gPluginLog;  // general plugin log
 };
 
 #endif   // PLUGIN_LOGGING
 
-#endif  // PR_LOGGING
-
 // Quick-use macros
 #ifdef PLUGIN_LOGGING
  #define NPN_PLUGIN_LOG(a, b)                              \
    PR_BEGIN_MACRO                                        \
    PR_LOG(nsPluginLogging::gNPNLog, a, b); \
    PR_LogFlush();                                                    \
    PR_END_MACRO
 #else