get xpidl building again on Win32

xpcom/tools/xpidl/makefile.win

@@ -31,6 +31,7 @@ OBJS =  \
 	$(NULL)
 
 LINCS=-I$(PUBLIC)\xpcom	\
+	-I$(PUBLIC)\libxpt	\
 	-I$(MOZ_TOOLS)\include	\
 	$(NULL)
 
@@ -38,6 +39,7 @@ LINCS=-I$(PUBLIC)\xpcom	\
 MYDIR=C:\USR\LOCAL
 
 MYLIBS=                         \
+ $(DIST)\lib\libxpt32.lib		\
  $(MOZ_TOOLS)\lib\glib-1.1.lib        \
  $(MOZ_TOOLS)\lib\libidl-0.5.lib     \
  $(NULL)

xpcom/tools/xpidl/xpidl_typelib.c

@@ -253,6 +253,8 @@ pass_1(TreeState *state)
 #ifdef DEBUG_shaver
         fprintf(stderr, "writing typelib was %ssuccessful\n",
                 ok ? "" : "not ");
+#else
+        ;   // msvc would like a statement here
 #endif
     }
 
@@ -391,13 +393,13 @@ fill_pd_from_type(TreeState *state, XPTParamDescriptor *pd, uint8 flags,
               }
               default:
                 fprintf(stderr, "Can't yet handle %s ident in param list\n",
-                        IDL_NODE_TYPE_NAME(up));
+                        /*IDL_NODE_TYPE_NAME(up)*/"that type");
                 return FALSE;
             }
             break;
           default:
             fprintf(stderr, "Can't yet handle %s in param list\n",
-                    IDL_NODE_TYPE_NAME(type));
+                    /*IDL_NODE_TYPE_NAME(up)*/"that type");
             return FALSE;
         }
     } else {

xpcom/typelib/xpidl/makefile.win

@@ -31,6 +31,7 @@ OBJS =  \
 	$(NULL)
 
 LINCS=-I$(PUBLIC)\xpcom	\
+	-I$(PUBLIC)\libxpt	\
 	-I$(MOZ_TOOLS)\include	\
 	$(NULL)
 
@@ -38,6 +39,7 @@ LINCS=-I$(PUBLIC)\xpcom	\
 MYDIR=C:\USR\LOCAL
 
 MYLIBS=                         \
+ $(DIST)\lib\libxpt32.lib		\
  $(MOZ_TOOLS)\lib\glib-1.1.lib        \
  $(MOZ_TOOLS)\lib\libidl-0.5.lib     \
  $(NULL)

xpcom/typelib/xpidl/xpidl_typelib.c

@@ -253,6 +253,8 @@ pass_1(TreeState *state)
 #ifdef DEBUG_shaver
         fprintf(stderr, "writing typelib was %ssuccessful\n",
                 ok ? "" : "not ");
+#else
+        ;   // msvc would like a statement here
 #endif
     }
 
@@ -391,13 +393,13 @@ fill_pd_from_type(TreeState *state, XPTParamDescriptor *pd, uint8 flags,
               }
               default:
                 fprintf(stderr, "Can't yet handle %s ident in param list\n",
-                        IDL_NODE_TYPE_NAME(up));
+                        /*IDL_NODE_TYPE_NAME(up)*/"that type");
                 return FALSE;
             }
             break;
           default:
             fprintf(stderr, "Can't yet handle %s in param list\n",
-                    IDL_NODE_TYPE_NAME(type));
+                    /*IDL_NODE_TYPE_NAME(up)*/"that type");
             return FALSE;
         }
     } else {