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

fix build bustage due to use of nscore.h before it is exported - I don't understand why this stuff is being compiled in the export phase. We can that later.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@25101 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jband%netscape.com
1999-03-25 09:05:28 +00:00
parent c27f993f33
commit d1bfe75c7b
4 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/xpcom/libxpt/xptinfo/src/nsInterfaceInfo.cpp
View File

@@ -18,8 +18,6 @@
/* Implementation of nsIInterfaceInfoManager. */
#include "nscore.h"
#include "nsISupports.h"
#include "nsIInterfaceInfo.h"
#include "nsIInterfaceInfoManager.h"
@@ -121,9 +119,9 @@ nsInterfaceInfo::GetMethodInfo(uint16 index, const nsXPTMethodInfo** info)
}
// else...
*info = NS_REINTERPRET_CAST(nsXPTMethodInfo*,
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[index - mMethodBaseIndex]);
*info = (nsXPTMethodInfo*)
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[index - mMethodBaseIndex];
return NS_OK;
}
@@ -133,20 +131,19 @@ nsInterfaceInfo::GetMethodInfoForName(const char* methodName, uint16 *index,
{
// XXX probably want to speed this up with a hashtable, or by at least interning
// the names to avoid the strcmp
nsresult rv;
for (uint16 i = mMethodBaseIndex; i < mMethodCount; i++) {
const nsXPTMethodInfo* info;
info = NS_REINTERPRET_CAST(nsXPTMethodInfo*,
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[i - mMethodBaseIndex]);
info = (nsXPTMethodInfo*)
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[i - mMethodBaseIndex];
if (PL_strcmp(methodName, info->name) == 0) {
#ifdef NS_DEBUG
// make sure there aren't duplicate names
for (; i < mMethodCount; i++) {
const nsXPTMethodInfo* info2;
info2 = NS_REINTERPRET_CAST(nsXPTMethodInfo*,
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[i - mMethodBaseIndex]);
info2 = (nsXPTMethodInfo*)
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[i - mMethodBaseIndex];
NS_ASSERTION(PL_strcmp(methodName, info2->name)!= 0, "duplicate names");
}
#endif
@@ -171,10 +168,9 @@ nsInterfaceInfo::GetConstant(uint16 index, const nsXPTConstant** constant)
}
// else...
*constant =
NS_REINTERPRET_CAST(nsXPTConstant*,
&mInterfaceRecord->interfaceDescriptor->
const_descriptors[index-mConstantBaseIndex]);
*constant = (nsXPTConstant*)
&mInterfaceRecord->interfaceDescriptor->
const_descriptors[index-mConstantBaseIndex];
return NS_OK;
}

1
mozilla/xpcom/libxpt/xptinfo/src/nsInterfaceInfoManager.cpp
View File

@@ -19,7 +19,6 @@
/* Implementation of nsIInterfaceInfo. */
#include <sys/stat.h>
#include "nscore.h"
#include "nsISupports.h"
#include "nsIInterfaceInfoManager.h"

28
mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfo.cpp
View File

@@ -18,8 +18,6 @@
/* Implementation of nsIInterfaceInfoManager. */
#include "nscore.h"
#include "nsISupports.h"
#include "nsIInterfaceInfo.h"
#include "nsIInterfaceInfoManager.h"
@@ -121,9 +119,9 @@ nsInterfaceInfo::GetMethodInfo(uint16 index, const nsXPTMethodInfo** info)
}
// else...
*info = NS_REINTERPRET_CAST(nsXPTMethodInfo*,
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[index - mMethodBaseIndex]);
*info = (nsXPTMethodInfo*)
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[index - mMethodBaseIndex];
return NS_OK;
}
@@ -133,20 +131,19 @@ nsInterfaceInfo::GetMethodInfoForName(const char* methodName, uint16 *index,
{
// XXX probably want to speed this up with a hashtable, or by at least interning
// the names to avoid the strcmp
nsresult rv;
for (uint16 i = mMethodBaseIndex; i < mMethodCount; i++) {
const nsXPTMethodInfo* info;
info = NS_REINTERPRET_CAST(nsXPTMethodInfo*,
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[i - mMethodBaseIndex]);
info = (nsXPTMethodInfo*)
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[i - mMethodBaseIndex];
if (PL_strcmp(methodName, info->name) == 0) {
#ifdef NS_DEBUG
// make sure there aren't duplicate names
for (; i < mMethodCount; i++) {
const nsXPTMethodInfo* info2;
info2 = NS_REINTERPRET_CAST(nsXPTMethodInfo*,
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[i - mMethodBaseIndex]);
info2 = (nsXPTMethodInfo*)
&mInterfaceRecord->interfaceDescriptor->
method_descriptors[i - mMethodBaseIndex];
NS_ASSERTION(PL_strcmp(methodName, info2->name)!= 0, "duplicate names");
}
#endif
@@ -171,10 +168,9 @@ nsInterfaceInfo::GetConstant(uint16 index, const nsXPTConstant** constant)
}
// else...
*constant =
NS_REINTERPRET_CAST(nsXPTConstant*,
&mInterfaceRecord->interfaceDescriptor->
const_descriptors[index-mConstantBaseIndex]);
*constant = (nsXPTConstant*)
&mInterfaceRecord->interfaceDescriptor->
const_descriptors[index-mConstantBaseIndex];
return NS_OK;
}

1
mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp
View File

@@ -19,7 +19,6 @@
/* Implementation of nsIInterfaceInfo. */
#include <sys/stat.h>
#include "nscore.h"
#include "nsISupports.h"
#include "nsIInterfaceInfoManager.h"