From 026b21cd31e236c1c35dc5f090b14676a39c1a3e Mon Sep 17 00:00:00 2001
From: Mark Banner <bugzilla@standard8.plus.com>
Date: Thu, 21 Oct 2010 22:01:38 +0100
Subject: [PATCH] Fix non-IPC bustage from bug 536289. Patch as agreed with jdm
 over irc. a=bustage-fix.

---
 netwerk/Makefile.in                       | 7 +++++++
 netwerk/protocol/http/HttpBaseChannel.cpp | 1 +
 netwerk/protocol/http/HttpBaseChannel.h   | 1 +
 3 files changed, 9 insertions(+)

diff --git a/netwerk/Makefile.in b/netwerk/Makefile.in
index 433595197d15..86e476436479 100644
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -60,6 +60,13 @@ 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
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index d73f0f8e4df1..58b681b9dec5 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -52,6 +52,7 @@
 #include "nsIResumableChannel.h"
 #include "nsIApplicationCacheChannel.h"
 #include "nsEscape.h"
+#include "nsPrintfCString.h"
 
 namespace mozilla {
 namespace net {
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index 647462b6f9c6..5f5f7cc38f5c 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -59,6 +59,7 @@
 #include "nsISupportsPriority.h"
 #include "nsIApplicationCache.h"
 #include "nsIResumableChannel.h"
+#include "mozilla/net/NeckoCommon.h"
 
 namespace mozilla {
 namespace net {