Bug 715206 - Remove XPConnect from IDB's LOCAL_INCLUDES (again); r=bholley
authorMs2ger <ms2ger@gmail.com>
Wed, 11 Jan 2012 09:23:07 +0100
changeset 84159 d2e9c6b60088cd562458fd24d000f12cb85090fb
parent 84158 109e7285c5eee7650494ebf560f596cb7ff71fc3
child 84160 df571c75b4c04ddfdc3a4a6dc97e5029d8446aca
push id21829
push userMs2ger@gmail.com
push dateWed, 11 Jan 2012 08:25:20 +0000
treeherdermozilla-central@c42d08fdec34 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
bugs715206
milestone12.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 715206 - Remove XPConnect from IDB's LOCAL_INCLUDES (again); r=bholley
content/base/src/nsGenericElement.cpp
dom/base/nsWrapperCacheInlines.h
dom/indexedDB/Makefile.in
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -150,16 +150,17 @@
 #include "nsCSSParser.h"
 #include "prprf.h"
 
 #include "nsSVGFeatures.h"
 #include "nsDOMMemoryReporter.h"
 #include "nsWrapperCacheInlines.h"
 
 #include "xpcpublic.h"
+#include "xpcprivate.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 NS_DEFINE_IID(kThisPtrOffsetsSID, NS_THISPTROFFSETS_SID);
 
 PRInt32 nsIContent::sTabFocusModel = eTabFocus_any;
 bool nsIContent::sTabFocusModelAppliesToXUL = false;
--- a/dom/base/nsWrapperCacheInlines.h
+++ b/dom/base/nsWrapperCacheInlines.h
@@ -35,17 +35,17 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsWrapperCacheInline_h___
 #define nsWrapperCacheInline_h___
 
 #include "nsWrapperCache.h"
-#include "xpcprivate.h"
+#include "xpcpublic.h"
 
 inline JSObject*
 nsWrapperCache::GetWrapperPreserveColor() const
 {
   JSObject *obj = GetJSObjectFromBits();
   return !IsProxy() || !obj || js::IsProxy(obj) ? obj : nsnull;
 }
 
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -92,17 +92,16 @@ EXPORTS_mozilla/dom/indexedDB = \
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/db/sqlite3/src \
   -I$(topsrcdir)/xpcom/build \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/src/storage \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
-  -I$(topsrcdir)/js/xpconnect/src \
   $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 # Make sure to quickstub as much as possible here! See
 # js/xpconnect/src/dom_quickstubs.qsconf.
 XPIDLSRCS = \
   nsIIDBCursor.idl \