From d2be3b75158b25c9756538a8e519804e85b05835 Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Thu, 4 Aug 2016 11:14:35 -0700 Subject: [PATCH] Bug 1292289, part 1 - Stop unnecessarily using xpcprivate in XPCWrapper.h. r=mrbkap This file is included in caps/, but it only uses generic JS things, aside from a macro. AccessCheck.cpp was bootlegging xpcprivate.h. MozReview-Commit-ID: C6fGOFxsTvg --HG-- extra : rebase_source : bd5e7bf9010acf83ccab8ce6cce77a557ad76196 --- js/xpconnect/src/XPCWrapper.h | 3 +-- js/xpconnect/wrappers/AccessCheck.cpp | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/xpconnect/src/XPCWrapper.h b/js/xpconnect/src/XPCWrapper.h index 0bdc483d44b0..7e0ed8c1f32c 100644 --- a/js/xpconnect/src/XPCWrapper.h +++ b/js/xpconnect/src/XPCWrapper.h @@ -7,8 +7,7 @@ #ifndef XPC_WRAPPER_H #define XPC_WRAPPER_H 1 -#include "xpcprivate.h" -#include "jswrapper.h" +#include "js/TypeDecls.h" namespace XPCNativeWrapper { diff --git a/js/xpconnect/wrappers/AccessCheck.cpp b/js/xpconnect/wrappers/AccessCheck.cpp index 009c5dae5f55..ff31e800f6fa 100644 --- a/js/xpconnect/wrappers/AccessCheck.cpp +++ b/js/xpconnect/wrappers/AccessCheck.cpp @@ -19,6 +19,7 @@ #include "mozilla/jsipc/CrossProcessObjectWrappers.h" #include "nsIDOMWindowCollection.h" #include "nsJSUtils.h" +#include "xpcprivate.h" using namespace mozilla; using namespace JS;