From 3d8ce1a11a7347cc94a937719c4bc8df46fb8d14 Mon Sep 17 00:00:00 2001 From: Pale Moon Date: Thu, 1 Sep 2016 13:39:08 +0200 Subject: Base import of Tycho code (warning: huge commit) --- dom/base/nsIDOMClassInfo.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'dom/base/nsIDOMClassInfo.h') diff --git a/dom/base/nsIDOMClassInfo.h b/dom/base/nsIDOMClassInfo.h index dda62bcc1..8a65084fd 100644 --- a/dom/base/nsIDOMClassInfo.h +++ b/dom/base/nsIDOMClassInfo.h @@ -7,7 +7,6 @@ #define nsIDOMClassInfo_h___ #include "nsIClassInfoImpl.h" -#include "nsVoidArray.h" #include "nsDOMClassInfoID.h" #include "nsIXPCScriptable.h" #include "nsIServiceManager.h" @@ -24,8 +23,7 @@ #define DEFAULT_SCRIPTABLE_FLAGS \ (DOM_BASE_SCRIPTABLE_FLAGS | \ - nsIXPCScriptable::WANT_NEWRESOLVE | \ - nsIXPCScriptable::WANT_CHECKACCESS | \ + nsIXPCScriptable::WANT_RESOLVE | \ nsIXPCScriptable::WANT_PRECREATE) #define DOM_DEFAULT_SCRIPTABLE_FLAGS \ @@ -34,7 +32,7 @@ nsIXPCScriptable::CLASSINFO_INTERFACES_ONLY) -#ifdef _IMPL_NS_LAYOUT +#ifdef MOZILLA_INTERNAL_API // See nsDOMClassInfoID.h @@ -57,7 +55,7 @@ sof->GetClassInfoInstance(eDOMClassInfo_##_class##_id); \ } else -#endif /* _IMPL_NS_LAYOUT */ +#endif /* MOZILLA_INTERNAL_API */ // Looks up the nsIClassInfo for a class name registered with the // nsScriptNamespaceManager. Remember to release NS_CLASSINFO_NAME(_class) @@ -139,7 +137,7 @@ NS_DOMCI_EXTENSION_NAME(_module)::~NS_DOMCI_EXTENSION_NAME(_module)() \ { \ } \ \ -NS_IMPL_ISUPPORTS1(NS_DOMCI_EXTENSION_NAME(_module), nsIDOMCIExtension) \ +NS_IMPL_ISUPPORTS(NS_DOMCI_EXTENSION_NAME(_module), nsIDOMCIExtension) \ \ NS_IMETHODIMP \ NS_DOMCI_EXTENSION_NAME(_module)::RegisterDOMCI(const char* aName, \ -- cgit v1.2.3