From 28ff5cd0ab1fd692dde333a7d4fbd3ff6703ca2c Mon Sep 17 00:00:00 2001 From: "mccabe%netscape.com" Date: Wed, 8 Sep 1999 00:45:13 +0000 Subject: [PATCH] Fixes to compile on DEC (gargamel) courtesy briano; remove XPT_ASSERT from macros, and remove unused macros from xpt_struct.c. git-svn-id: svn://10.0.0.236/trunk@46269 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/typelib/xpt/src/xpt_struct.c | 10 ---------- mozilla/xpcom/typelib/xpt/src/xpt_xdr.c | 8 +++----- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/mozilla/xpcom/typelib/xpt/src/xpt_struct.c b/mozilla/xpcom/typelib/xpt/src/xpt_struct.c index f25bd733ba8..f1dfe9496c1 100644 --- a/mozilla/xpcom/typelib/xpt/src/xpt_struct.c +++ b/mozilla/xpcom/typelib/xpt/src/xpt_struct.c @@ -67,16 +67,6 @@ DoTypeDescriptor(XPTCursor *cursor, XPTTypeDescriptor *td); static PRBool DoParamDescriptor(XPTCursor *cursor, XPTParamDescriptor *pd); - -#define CURS_POOL_OFFSET_RAW(cursor) \ - ((cursor)->pool == XPT_HEADER \ - ? (cursor)->offset \ - : (XPT_ASSERT((cursor)->state->data_offset), \ - (cursor)->offset + (cursor)->state->data_offset)) - -#define CURS_POOL_OFFSET(cursor) \ - (CURS_POOL_OFFSET_RAW(cursor) - 1) - XPT_PUBLIC_API(PRUint32) XPT_SizeOfHeader(XPTHeader *header) { diff --git a/mozilla/xpcom/typelib/xpt/src/xpt_xdr.c b/mozilla/xpcom/typelib/xpt/src/xpt_xdr.c index 48a30e2f85a..cd96f32159a 100644 --- a/mozilla/xpcom/typelib/xpt/src/xpt_xdr.c +++ b/mozilla/xpcom/typelib/xpt/src/xpt_xdr.c @@ -32,8 +32,7 @@ CheckForRepeat(XPTCursor *cursor, void **addrp, XPTPool pool, PRUint32 len, #define CURS_POOL_OFFSET_RAW(cursor) \ ((cursor)->pool == XPT_HEADER \ ? (cursor)->offset \ - : (XPT_ASSERT((cursor)->state->data_offset), \ - (cursor)->offset + (cursor)->state->data_offset)) + : ((cursor)->offset + (cursor)->state->data_offset)) #define CURS_POOL_OFFSET(cursor) \ (CURS_POOL_OFFSET_RAW(cursor) - 1) @@ -70,9 +69,8 @@ CheckForRepeat(XPTCursor *cursor, void **addrp, XPTPool pool, PRUint32 len, #define CHECK_COUNT(cursor, space) \ (CHECK_COUNT_(cursor, space) \ ? PR_TRUE \ - : (XPT_ASSERT(0), \ - fprintf(stderr, "FATAL: can't no room for %d in cursor\n", space), \ - PR_FALSE)) + : fprintf(stderr, "FATAL: can't no room for %d in cursor\n", space), \ + PR_FALSE) /* increase the data allocation for the pool by XPT_GROW_CHUNK */ #define XPT_GROW_CHUNK 8192