From 9733ee889dbdade13c0a784cd3889f5269eb4f66 Mon Sep 17 00:00:00 2001 From: "jband%netscape.com" Date: Fri, 19 Feb 1999 21:39:41 +0000 Subject: [PATCH] get xpidl building again on Win32 --- xpcom/tools/xpidl/makefile.win | 2 ++ xpcom/tools/xpidl/xpidl_typelib.c | 6 ++++-- xpcom/typelib/xpidl/makefile.win | 2 ++ xpcom/typelib/xpidl/xpidl_typelib.c | 6 ++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xpcom/tools/xpidl/makefile.win b/xpcom/tools/xpidl/makefile.win index 20b559347e8a..dec6fc6ea6be 100644 --- a/xpcom/tools/xpidl/makefile.win +++ b/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) diff --git a/xpcom/tools/xpidl/xpidl_typelib.c b/xpcom/tools/xpidl/xpidl_typelib.c index 22b65f6aa19b..f83429b9880e 100644 --- a/xpcom/tools/xpidl/xpidl_typelib.c +++ b/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 { diff --git a/xpcom/typelib/xpidl/makefile.win b/xpcom/typelib/xpidl/makefile.win index 20b559347e8a..dec6fc6ea6be 100644 --- a/xpcom/typelib/xpidl/makefile.win +++ b/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) diff --git a/xpcom/typelib/xpidl/xpidl_typelib.c b/xpcom/typelib/xpidl/xpidl_typelib.c index 22b65f6aa19b..f83429b9880e 100644 --- a/xpcom/typelib/xpidl/xpidl_typelib.c +++ b/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 {