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

java/xpcom/old/tools/genproxy.c

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

xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp

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

xpcom/typelib/xpidl/xpidl_typelib.c

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

xpcom/typelib/xpt/public/xpt_struct.h

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

xpcom/typelib/xpt/src/xpt_struct.c

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

xpcom/typelib/xpt/tools/xpt_dump.c

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

xpcom/typelib/xpt/tools/xpt_link.c

@@ -418,11 +418,11 @@ main(int argc, char **argv)
                     }
 
                     if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) {
-                        td->type.interface = 
+                        td->type.iface = 
                             get_new_index(fix_array, 
                                           totalNumberOfInterfaces,
                                           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;
                 if (XPT_TDP_TAG(td->prefix) == TD_INTERFACE_TYPE) {
-                    td->type.interface = 
+                    td->type.iface = 
                         get_new_index(fix_array, totalNumberOfInterfaces,
                                       fix_array[i].file_num, 
-                                      td->type.interface);
+                                      td->type.iface);
                 }                
             }
         }