From e29426481470bda53b0e5b9ed0f3b04151fe0444 Mon Sep 17 00:00:00 2001 From: "shaver%netscape.com" Date: Tue, 9 Mar 1999 08:23:00 +0000 Subject: [PATCH] turn off more debugging noise and prepare for 0.6.2's forward handling git-svn-id: svn://10.0.0.236/trunk@23298 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/tools/xpidl/xpidl_idl.c | 6 +++++- mozilla/xpcom/tools/xpidl/xpidl_typelib.c | 4 ++-- mozilla/xpcom/typelib/xpidl/xpidl_idl.c | 6 +++++- mozilla/xpcom/typelib/xpidl/xpidl_typelib.c | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mozilla/xpcom/tools/xpidl/xpidl_idl.c b/mozilla/xpcom/tools/xpidl/xpidl_idl.c index 2623c6afe09..18fbb7f79e0 100644 --- a/mozilla/xpcom/tools/xpidl/xpidl_idl.c +++ b/mozilla/xpcom/tools/xpidl/xpidl_idl.c @@ -462,7 +462,11 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path, rv = IDL_parse_filename_with_input(filename, input_callback, &stack, msg_callback, &top, - &state.ns, IDLF_XPIDL, + &state.ns, +#if LIBIDL_VERSION_CODE >= LIBIDL_VERSION (0,6,2) + IDLF_IGNORE_FORWARDS | +#endif + IDLF_XPIDL, enable_warnings ? IDL_WARNING1 : IDL_ERROR); if (rv != IDL_SUCCESS) { diff --git a/mozilla/xpcom/tools/xpidl/xpidl_typelib.c b/mozilla/xpcom/tools/xpidl/xpidl_typelib.c index a2e3f739a57..7e2fa0e0387 100644 --- a/mozilla/xpcom/tools/xpidl/xpidl_typelib.c +++ b/mozilla/xpcom/tools/xpidl/xpidl_typelib.c @@ -42,7 +42,7 @@ struct priv_data { #define NEXT_CONST(state) (((struct priv_data *)state->priv)->next_const) #ifdef DEBUG_shaver -#define DEBUG_shaver_sort +/* #define DEBUG_shaver_sort */ #endif /* @@ -707,7 +707,7 @@ typelib_op_dcl(TreeState *state) if (!fill_pd_as_nsresult(meth->result)) return FALSE; } else { -#ifdef DEBUG_shaver +#ifdef DEBUG_shaver_notxpcom fprintf(stderr, "%s is notxpcom\n", IDL_IDENT(op->ident).str); #endif if (!fill_pd_from_type(state, meth->result, XPT_PD_RETVAL, diff --git a/mozilla/xpcom/typelib/xpidl/xpidl_idl.c b/mozilla/xpcom/typelib/xpidl/xpidl_idl.c index 2623c6afe09..18fbb7f79e0 100644 --- a/mozilla/xpcom/typelib/xpidl/xpidl_idl.c +++ b/mozilla/xpcom/typelib/xpidl/xpidl_idl.c @@ -462,7 +462,11 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path, rv = IDL_parse_filename_with_input(filename, input_callback, &stack, msg_callback, &top, - &state.ns, IDLF_XPIDL, + &state.ns, +#if LIBIDL_VERSION_CODE >= LIBIDL_VERSION (0,6,2) + IDLF_IGNORE_FORWARDS | +#endif + IDLF_XPIDL, enable_warnings ? IDL_WARNING1 : IDL_ERROR); if (rv != IDL_SUCCESS) { diff --git a/mozilla/xpcom/typelib/xpidl/xpidl_typelib.c b/mozilla/xpcom/typelib/xpidl/xpidl_typelib.c index a2e3f739a57..7e2fa0e0387 100644 --- a/mozilla/xpcom/typelib/xpidl/xpidl_typelib.c +++ b/mozilla/xpcom/typelib/xpidl/xpidl_typelib.c @@ -42,7 +42,7 @@ struct priv_data { #define NEXT_CONST(state) (((struct priv_data *)state->priv)->next_const) #ifdef DEBUG_shaver -#define DEBUG_shaver_sort +/* #define DEBUG_shaver_sort */ #endif /* @@ -707,7 +707,7 @@ typelib_op_dcl(TreeState *state) if (!fill_pd_as_nsresult(meth->result)) return FALSE; } else { -#ifdef DEBUG_shaver +#ifdef DEBUG_shaver_notxpcom fprintf(stderr, "%s is notxpcom\n", IDL_IDENT(op->ident).str); #endif if (!fill_pd_from_type(state, meth->result, XPT_PD_RETVAL,