Bug 614449 - Build bustage in netwerk with --disable-ipc. a=bustage
authorJason Duell <jduell.mcbugs@gmail.com>
Tue, 23 Nov 2010 17:19:21 -0800
changeset 58120 052a96664eba9433af0f58a515b25f53b770a02b
parent 58119 160e6bf9752e638bd61f6c645d612d8b82d7efb3
child 58121 2aceea4f527bfa32a2db95f7b465ef4961b24a95
push id17165
push userjduell@mozilla.com
push dateWed, 24 Nov 2010 01:24:43 +0000
treeherdermozilla-central@052a96664eba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs614449
milestone2.0b8pre
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 614449 - Build bustage in netwerk with --disable-ipc. a=bustage
netwerk/base/public/nsNetUtil.h
--- a/netwerk/base/public/nsNetUtil.h
+++ b/netwerk/base/public/nsNetUtil.h
@@ -102,18 +102,21 @@
 #include "nsIMutable.h"
 #include "nsIPropertyBag2.h"
 #include "nsIWritablePropertyBag2.h"
 #include "nsIIDNService.h"
 #include "nsIChannelEventSink.h"
 #include "nsIChannelPolicy.h"
 #include "nsISocketProviderService.h"
 #include "nsISocketProvider.h"
+#include "mozilla/Services.h"
+
+#ifdef MOZ_IPC
 #include "nsIRedirectChannelRegistrar.h"
-#include "mozilla/Services.h"
+#endif
 
 #ifdef MOZILLA_INTERNAL_API
 
 inline already_AddRefed<nsIIOService>
 do_GetIOService(nsresult* error = 0)
 {
     already_AddRefed<nsIIOService> ret = mozilla::services::GetIOService();
     if (error)
@@ -1776,31 +1779,33 @@ NS_IsInternalSameURIRedirect(nsIChannel 
   if (!oldURI || !newURI) {
     return PR_FALSE;
   }
 
   PRBool res;
   return NS_SUCCEEDED(oldURI->Equals(newURI, &res)) && res;
 }
 
+#ifdef MOZ_IPC
 inline nsresult
 NS_LinkRedirectChannels(PRUint32 channelId,
                         nsIParentChannel *parentChannel,
                         nsIChannel** _result)
 {
   nsresult rv;
 
   nsCOMPtr<nsIRedirectChannelRegistrar> registrar =
       do_GetService("@mozilla.org/redirectchannelregistrar;1", &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return registrar->LinkChannels(channelId,
                                  parentChannel,
                                  _result);
 }
+#endif // MOZ_IPC
 
 /**
  * Helper function to create a random URL string that's properly formed
  * but guaranteed to be invalid.
  */  
 #define NS_FAKE_SCHEME "http://"
 #define NS_FAKE_TLD ".invalid"
 inline nsresult