Fix non-IPC bustage from bug 536289. Patch as agreed with jdm over irc. a=bustage-fix.
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 21 Oct 2010 22:01:38 +0100
changeset 56337 112490ab7b5856dede85e38bf6bef0b9755fc278
parent 56336 89963dd9890fb2b396a720da84c9701efbe51f4e
child 56338 da4897bd001de8ead0c5e7b82a5bd0b9ea4e8cee
push idunknown
push userunknown
push dateunknown
reviewersbustage-fix
bugs536289
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
Fix non-IPC bustage from bug 536289. Patch as agreed with jdm over irc. a=bustage-fix.
netwerk/Makefile.in
netwerk/protocol/http/HttpBaseChannel.cpp
netwerk/protocol/http/HttpBaseChannel.h
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -55,16 +55,23 @@ DIRS		= \
 		protocol \
 		system \
         $(NULL)
 
 ifdef MOZ_IPC
 DIRS 		+= \
 	        ipc  \
 	        $(NULL)
+else
+# Non-IPC builds need NeckoCommon.h
+EXPORTS_NAMESPACES = mozilla/net
+
+EXPORTS_mozilla/net = \
+  ipc/NeckoCommon.h       \
+  $(NULL)
 endif
 
 ifdef NECKO_WIFI
 DIRS 		+= wifi
 endif
 
 DIRS		+= \
 		build \
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -47,16 +47,17 @@
 #include "nsNetUtil.h"
 
 #include "nsICachingChannel.h"
 #include "nsISeekableStream.h"
 #include "nsIEncodedChannel.h"
 #include "nsIResumableChannel.h"
 #include "nsIApplicationCacheChannel.h"
 #include "nsEscape.h"
+#include "nsPrintfCString.h"
 
 namespace mozilla {
 namespace net {
 
 HttpBaseChannel::HttpBaseChannel()
   : mStartPos(LL_MAXUINT)
   , mStatus(NS_OK)
   , mLoadFlags(LOAD_NORMAL)
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -54,16 +54,17 @@
 #include "nsIUploadChannel.h"
 #include "nsIUploadChannel2.h"
 #include "nsIProgressEventSink.h"
 #include "nsIURI.h"
 #include "nsIStringEnumerator.h"
 #include "nsISupportsPriority.h"
 #include "nsIApplicationCache.h"
 #include "nsIResumableChannel.h"
+#include "mozilla/net/NeckoCommon.h"
 
 namespace mozilla {
 namespace net {
 
 /*
  * This class is a partial implementation of nsIHttpChannel.  It contains code
  * shared by nsHttpChannel and HttpChannelChild. 
  * - Note that this class has nothing to do with nsBaseChannel, which is an