Bug 941068 - Build netwerk/base in unified mode - r=mcmanus,ehsan

netwerk/base/src/moz.build

@@ -16,7 +16,7 @@ EXPORTS.mozilla.net += [
     'DashboardTypes.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'ArrayBufferInputStream.cpp',
     'BackgroundFileSaver.cpp',
     'Dashboard.cpp',

netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp

@@ -17,6 +17,7 @@
 #include "nsIHttpChannelInternal.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 
+#undef LOG
 #ifdef PR_LOGGING
 static PRLogModuleInfo *
 GetRedirectLog()

netwerk/base/src/nsAsyncStreamCopier.cpp

@@ -11,6 +11,7 @@
 
 using namespace mozilla;
 
+#undef LOG
 #if defined(PR_LOGGING)
 //
 // NSPR_LOG_MODULES=nsStreamCopier:5

netwerk/base/src/nsAutodialWin.cpp

@@ -33,6 +33,8 @@
 static PRLogModuleInfo* gLog = nullptr;
 #endif
 
+#undef LOGD
+#undef LOGE
 #define LOGD(args) PR_LOG(gLog, PR_LOG_DEBUG, args)
 #define LOGE(args) PR_LOG(gLog, PR_LOG_ERROR, args)
 

netwerk/base/src/nsChannelClassifier.cpp

@@ -18,6 +18,7 @@
 //
 static PRLogModuleInfo *gChannelClassifierLog;
 #endif
+#undef LOG
 #define LOG(args)     PR_LOG(gChannelClassifierLog, PR_LOG_DEBUG, args)
 
 NS_IMPL_ISUPPORTS1(nsChannelClassifier,

netwerk/base/src/nsInputStreamPump.cpp

@@ -27,6 +27,7 @@ static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID);
 //
 static PRLogModuleInfo *gStreamPumpLog = nullptr;
 #endif
+#undef LOG
 #define LOG(args) PR_LOG(gStreamPumpLog, PR_LOG_DEBUG, args)
 
 //-----------------------------------------------------------------------------

netwerk/base/src/nsLoadGroup.cpp

@@ -42,6 +42,7 @@ using namespace mozilla::net;
 static PRLogModuleInfo* gLoadGroupLog = nullptr;
 #endif
 
+#undef LOG
 #define LOG(args) PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, args)
 
 ////////////////////////////////////////////////////////////////////////////////

netwerk/base/src/nsPACMan.cpp

@@ -19,17 +19,9 @@
 using namespace mozilla;
 using namespace mozilla::net;
 
-#include "prlog.h"
 #if defined(PR_LOGGING)
-static PRLogModuleInfo *
-GetProxyLog()
-{
-    static PRLogModuleInfo *sLog;
-    if (!sLog)
-        sLog = PR_NewLogModule("proxy");
-    return sLog;
-}
 #endif
+#undef LOG
 #define LOG(args) PR_LOG(GetProxyLog(), PR_LOG_DEBUG, args)
 
 // The PAC thread does evaluations of both PAC files and
@@ -699,3 +691,18 @@ nsPACMan::Init(nsISystemProxySettings *systemProxySettings)
 
   return NS_OK;
 }
+
+namespace mozilla {
+namespace net {
+
+PRLogModuleInfo*
+GetProxyLog()
+{
+    static PRLogModuleInfo *sLog;
+    if (!sLog)
+        sLog = PR_NewLogModule("proxy");
+    return sLog;
+}
+
+}
+}

netwerk/base/src/nsPACMan.h

@@ -19,6 +19,7 @@
 #include "mozilla/LinkedList.h"
 #include "nsAutoPtr.h"
 #include "mozilla/TimeStamp.h"
+#include "prlog.h"
 
 class nsPACMan;
 class nsISystemProxySettings;
@@ -222,4 +223,10 @@ private:
   bool                         mInProgress;
 };
 
+namespace mozilla {
+namespace net {
+PRLogModuleInfo* GetProxyLog();
+}
+}
+
 #endif  // nsPACMan_h__

netwerk/base/src/nsProtocolProxyService.cpp

@@ -36,16 +36,9 @@ using namespace mozilla;
 
 #include "prlog.h"
 #if defined(PR_LOGGING)
-static PRLogModuleInfo *
-GetProxyLog()
-{
-    static PRLogModuleInfo *sLog;
-    if (!sLog)
-        sLog = PR_NewLogModule("proxy");
-    return sLog;
-}
 #endif
-#define LOG(args) PR_LOG(GetProxyLog(), PR_LOG_DEBUG, args)
+#undef LOG
+#define LOG(args) PR_LOG(net::GetProxyLog(), PR_LOG_DEBUG, args)
 
 //----------------------------------------------------------------------------
 

netwerk/base/src/nsRequestObserverProxy.cpp

@@ -17,6 +17,7 @@ using namespace mozilla;
 static PRLogModuleInfo *gRequestObserverProxyLog;
 #endif
 
+#undef LOG
 #define LOG(args) PR_LOG(gRequestObserverProxyLog, PR_LOG_DEBUG, args)
 
 //-----------------------------------------------------------------------------

netwerk/base/src/nsSimpleURI.cpp

@@ -5,6 +5,7 @@
 
 #include "mozilla/DebugOnly.h"
 
+#undef LOG
 #include "IPCMessageUtils.h"
 
 #include "nsSimpleURI.h"

netwerk/base/src/nsSocketTransport2.cpp

@@ -1637,8 +1637,9 @@ nsSocketTransport::OnSocketEvent(uint32_t type, nsresult status, nsISupports *pa
 #endif
                 mCondition = ResolveHost();
 
-        } else
+        } else {
             SOCKET_LOG(("  ignoring redundant event\n"));
+        }
         break;
 
     case MSG_DNS_LOOKUP_COMPLETE:

netwerk/base/src/nsStandardURL.cpp

@@ -46,6 +46,7 @@ static PRLogModuleInfo *gStandardURLLog;
 // The Chromium code defines its own LOG macro which we don't want
 #undef LOG
 #define LOG(args)     PR_LOG(gStandardURLLog, PR_LOG_DEBUG, args)
+#undef LOG_ENABLED
 #define LOG_ENABLED() PR_LOG_TEST(gStandardURLLog, PR_LOG_DEBUG)
 
 //----------------------------------------------------------------------------