Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Unix bustage. The X11 headers collide with nsIRegistry because X11 does '#define None'. Boneheads.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/PLUGIN_LOVE_2000_07_17_BRANCH@74442 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
2000-07-19 04:00:38 +00:00
parent da25d9e235
commit 3259da1fb7
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -43,6 +43,12 @@
#include "nsNetUtil.h"
#include "nsIProgressEventSink.h"
#include "nsIDocument.h"
// Friggin' X11 has to "#define None". Lame!
#ifdef None
#undef None
#endif
#include "nsIRegistry.h"
#include "nsEnumeratorUtils.h"
@@ -118,6 +124,8 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static NS_DEFINE_IID(kIFileUtilitiesIID, NS_IFILEUTILITIES_IID);
static NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID);
static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
// for the dialog
static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
@@ -1501,8 +1509,6 @@ NS_IMETHODIMP nsPluginHostImpl::PostURL(nsISupports* pluginInst,
return rv;
}
static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID,
const char* aPluginName,
const char* aDescription,
@@ -2983,7 +2989,6 @@ nsPluginHostImpl::LoadXPCOMPlugins(nsIComponentManager* aComponentManager, nsIFi
//
// Enumerate through that list now, creating an nsPluginTag for
// each.
static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
nsCOMPtr<nsIRegistry> registry = do_CreateInstance(kRegistryCID);
if (! registry)
return NS_ERROR_FAILURE;

11
mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@@ -43,6 +43,12 @@
#include "nsNetUtil.h"
#include "nsIProgressEventSink.h"
#include "nsIDocument.h"
// Friggin' X11 has to "#define None". Lame!
#ifdef None
#undef None
#endif
#include "nsIRegistry.h"
#include "nsEnumeratorUtils.h"
@@ -118,6 +124,8 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static NS_DEFINE_IID(kIFileUtilitiesIID, NS_IFILEUTILITIES_IID);
static NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID);
static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
// for the dialog
static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
@@ -1501,8 +1509,6 @@ NS_IMETHODIMP nsPluginHostImpl::PostURL(nsISupports* pluginInst,
return rv;
}
static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID,
const char* aPluginName,
const char* aDescription,
@@ -2983,7 +2989,6 @@ nsPluginHostImpl::LoadXPCOMPlugins(nsIComponentManager* aComponentManager, nsIFi
//
// Enumerate through that list now, creating an nsPluginTag for
// each.
static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
nsCOMPtr<nsIRegistry> registry = do_CreateInstance(kRegistryCID);
if (! registry)
return NS_ERROR_FAILURE;