Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

on some windows configurations, the build has been messed up for at least a couple of weeks because some microsoft header file defines 'interface', which conflicts with the member variable in xpt_struct.h. rename the member variable from interface to iface. workaround suggested by alecf@netscape.com. r=jband@netscape.com, a=waterson@mozilla.org

Browse Source
This commit is contained in:
dmose%mozilla.org 2000-07-28 04:03:50 +00:00
parent 7634788461
commit 4b5231a715
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/xpcom/old/tools/genproxy.c
View File

@ -609,7 +609,7 @@ GenproxyGetStringForType(XPTHeader *header, XPTTypeDescriptor *td,
int tag = XPT_TDP_TAG(td->prefix); int tag = XPT_TDP_TAG(td->prefix);
if (tag == TD_INTERFACE_TYPE) { if (tag == TD_INTERFACE_TYPE) {
int idx = td->type.interface; int idx = td->type.iface;
if (!idx || idx > header->num_interfaces) if (!idx || idx > header->num_interfaces)
*type_string = "/*unknown*/ nsISupports"; *type_string = "/*unknown*/ nsISupports";
else else
@ -630,7 +630,7 @@ GenproxyGetStringForRefType(XPTHeader *header, XPTTypeDescriptor *td,
int tag = XPT_TDP_TAG(td->prefix); int tag = XPT_TDP_TAG(td->prefix);
if (tag == TD_INTERFACE_TYPE) { if (tag == TD_INTERFACE_TYPE) {
int idx = td->type.interface; int idx = td->type.iface;
if (!idx || idx > header->num_interfaces) if (!idx || idx > header->num_interfaces)
*type_string = "nsISupports"; *type_string = "nsISupports";
else else

4
xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
View File

@ -407,7 +407,7 @@ xptiInterfaceInfo::GetInfoForParam(uint16 methodIndex,
nsIInterfaceInfo* theInfo = nsIInterfaceInfo* theInfo =
mInterface->mWorkingSet->GetTypelibGuts(mInterface->mTypelib)-> mInterface->mWorkingSet->GetTypelibGuts(mInterface->mTypelib)->
GetInfoAtNoAddRef(td->type.interface - 1); GetInfoAtNoAddRef(td->type.iface - 1);
NS_IF_ADDREF(*info = theInfo); NS_IF_ADDREF(*info = theInfo);
return NS_OK; return NS_OK;
@ -448,7 +448,7 @@ xptiInterfaceInfo::GetIIDForParam(uint16 methodIndex,
nsIInterfaceInfo* theInfo = nsIInterfaceInfo* theInfo =
mInterface->mWorkingSet->GetTypelibGuts(mInterface->mTypelib)-> mInterface->mWorkingSet->GetTypelibGuts(mInterface->mTypelib)->
GetInfoAtNoAddRef(td->type.interface - 1); GetInfoAtNoAddRef(td->type.iface - 1);
return theInfo->GetIID(iid); return theInfo->GetIID(iid);
} }

4
xpcom/typelib/xpidl/xpidl_typelib.c
View File

@ -800,10 +800,10 @@ handle_iid_is:
className); className);
return FALSE; return FALSE;
} }
td->type.interface = ide - ides + 1; td->type.iface = ide - ides + 1;
#ifdef DEBUG_shaver_index #ifdef DEBUG_shaver_index
fprintf(stderr, "DBG: index %d for %s\n", fprintf(stderr, "DBG: index %d for %s\n",
td->type.interface, className); td->type.iface, className);
#endif #endif
} }
break; break;

2
xpcom/typelib/xpt/public/xpt_struct.h
View File

@ -293,7 +293,7 @@ struct XPTTypeDescriptor {
PRUint8 argnum; /* used for iid_is and size_is */ PRUint8 argnum; /* used for iid_is and size_is */
PRUint8 argnum2; /* used for length_is */ PRUint8 argnum2; /* used for length_is */
union { union {
PRUint16 interface; /* used for TD_INTERFACE_TYPE */ PRUint16 iface; /* used for TD_INTERFACE_TYPE */
PRUint16 additional_type; /* used for TD_ARRAY */ PRUint16 additional_type; /* used for TD_ARRAY */
} type; } type;
}; };

2
xpcom/typelib/xpt/src/xpt_struct.c
View File

@ -780,7 +780,7 @@ DoTypeDescriptor(XPTArena *arena, XPTCursor *cursor, XPTTypeDescriptor *td,
switch (XPT_TDP_TAG(td->prefix)) { switch (XPT_TDP_TAG(td->prefix)) {
case TD_INTERFACE_TYPE: case TD_INTERFACE_TYPE:
if (!XPT_Do16(cursor, &td->type.interface)) if (!XPT_Do16(cursor, &td->type.iface))
goto error; goto error;
break; break;
case TD_INTERFACE_IS_TYPE: case TD_INTERFACE_IS_TYPE:

4
xpcom/typelib/xpt/tools/xpt_dump.c
View File

@ -634,7 +634,7 @@ XPT_GetStringForType(XPTHeader *header, XPTTypeDescriptor *td,
} }
if (tag == TD_INTERFACE_TYPE) { if (tag == TD_INTERFACE_TYPE) {
int idx = td->type.interface; int idx = td->type.iface;
if (!idx || idx > header->num_interfaces) if (!idx || idx > header->num_interfaces)
*type_string = "UNKNOWN_INTERFACE"; *type_string = "UNKNOWN_INTERFACE";
else else
@ -772,7 +772,7 @@ XPT_DumpTypeDescriptor(XPTTypeDescriptor *td,
if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) { if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) {
fprintf(stdout, "%*sInterfaceTypeDescriptor:\n", indent, " "); fprintf(stdout, "%*sInterfaceTypeDescriptor:\n", indent, " ");
fprintf(stdout, "%*sIndex of IDE: %d\n", new_indent, " ", fprintf(stdout, "%*sIndex of IDE: %d\n", new_indent, " ",
td->type.interface); td->type.iface);
} }
if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_IS_TYPE) { if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_IS_TYPE) {

8
xpcom/typelib/xpt/tools/xpt_link.c
View File

@ -418,11 +418,11 @@ main(int argc, char **argv)
} }
if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) { if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) {
td->type.interface = td->type.iface =
get_new_index(fix_array, get_new_index(fix_array,
totalNumberOfInterfaces, totalNumberOfInterfaces,
fix_array[i].file_num, fix_array[i].file_num,
td->type.interface); td->type.iface);
} }
} }
@ -431,10 +431,10 @@ main(int argc, char **argv)
*/ */
td = &id->method_descriptors[j].result->type; td = &id->method_descriptors[j].result->type;
if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) { if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) {
td->type.interface = td->type.iface =
get_new_index(fix_array, totalNumberOfInterfaces, get_new_index(fix_array, totalNumberOfInterfaces,
fix_array[i].file_num, fix_array[i].file_num,
td->type.interface); td->type.iface);
} }
} }
} }