From 377c0b4ee8f6a53e8da627d77d87820da932b447 Mon Sep 17 00:00:00 2001 From: "cyeh%netscape.com" Date: Mon, 28 Sep 1998 19:56:38 +0000 Subject: [PATCH] removing old NSPR20 and MOCHA #ifdefs. Sorry for the rebuild. git-svn-id: svn://10.0.0.236/trunk@11239 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/include/libevent.h | 4 ---- mozilla/include/libi18n.h | 3 +-- mozilla/include/lo_ele.h | 20 ++++++++++---------- mozilla/include/mcom_db.h | 3 --- mozilla/include/nslocks.h | 2 -- mozilla/include/proto.h | 6 ------ mozilla/include/shistele.h | 4 ++-- mozilla/include/structs.h | 4 ++-- mozilla/include/xp_core.h | 4 ---- 9 files changed, 15 insertions(+), 35 deletions(-) diff --git a/mozilla/include/libevent.h b/mozilla/include/libevent.h index 411906572eb..b93c1349ac8 100644 --- a/mozilla/include/libevent.h +++ b/mozilla/include/libevent.h @@ -26,11 +26,7 @@ #include "libmocha.h" #include "prtypes.h" -#ifndef NSPR20 -#include "prevent.h" -#else #include "plevent.h" -#endif #include "shist.h" #include "fe_proto.h" #include "lo_ele.h" diff --git a/mozilla/include/libi18n.h b/mozilla/include/libi18n.h index e227612b15f..0653b054bb3 100644 --- a/mozilla/include/libi18n.h +++ b/mozilla/include/libi18n.h @@ -895,9 +895,8 @@ PUBLIC int INTL_CharLen( * @see INTL_CharLen */ PUBLIC int -#ifdef NSPR20 + PR_CALLBACK -#endif INTL_IsLeadByte( int charSetID, unsigned char ch diff --git a/mozilla/include/lo_ele.h b/mozilla/include/lo_ele.h index c0c56c9ea54..5090ccdd609 100644 --- a/mozilla/include/lo_ele.h +++ b/mozilla/include/lo_ele.h @@ -201,13 +201,13 @@ struct LO_AnchorData_struct { PA_Block anchor; /* really a (char *) */ PA_Block target; /* really a (char *) */ PA_Block alt; /* really a (char *) */ -#ifdef MOCHA + LO_Element *element; /* Needed for mocha reflection of layout position. */ CL_Layer *layer; /* Layer containing anchor */ struct JSObject *mocha_object; XP_Bool event_handler_present; /*Indicates whether there's a JS handler */ -#endif + uint8 flags; /* Indicates whether to suppress visual feedback */ double prevalue; /* */ }; @@ -483,9 +483,9 @@ struct LO_ImageStruct_struct { int32 percent_width; /* For relayout */ int32 percent_height; /* For relayout */ -#ifdef MOCHA + struct JSObject *mocha_object; -#endif + CL_Layer *layer; XP_Rect valid_rect; IL_ImageReq *image_req; /* Image library representation. */ @@ -769,10 +769,10 @@ struct LO_FormElementStruct_struct { int32 edit_offset; int32 layer_id; -#ifdef MOCHA + struct JSObject *mocha_object; XP_Bool event_handler_present; /*Indicates whether there's a JS handler */ -#endif + int16 border_vert_space; int16 border_horiz_space; @@ -986,9 +986,9 @@ struct LO_CommonPluginStruct_struct { int32 percent_width; /* needed for relayout. */ int32 percent_height; /* needed for relayout. */ PA_Block base_url; -#ifdef MOCHA + struct JSObject *mocha_object; -#endif + int16 sub_type; }; @@ -1016,9 +1016,9 @@ struct LO_BuiltinStruct_struct { uint16 ele_attrmask; /* floating, secure, selected, etc. */ int32 builtin_index; /* Unique ID within this doc */ struct LO_BuiltinStruct_struct *nextBuiltin; -#ifdef MOCHA + struct JSObject *mocha_object; -#endif + PA_Tag *tag; CL_Layer *layer; diff --git a/mozilla/include/mcom_db.h b/mozilla/include/mcom_db.h index f2ed6fcf63d..f19564e1cbc 100644 --- a/mozilla/include/mcom_db.h +++ b/mozilla/include/mcom_db.h @@ -176,9 +176,6 @@ #ifdef macintosh #include #include "xp_mcom.h" -#ifndef NSPR20 -#include "prmacos.h" -#endif #define BIG_ENDIAN 4321 #define LITTLE_ENDIAN 1234 #define BYTE_ORDER BIG_ENDIAN diff --git a/mozilla/include/nslocks.h b/mozilla/include/nslocks.h index b2e458c1cae..a54dcd6f469 100644 --- a/mozilla/include/nslocks.h +++ b/mozilla/include/nslocks.h @@ -25,13 +25,11 @@ * it was only included if java was included. */ #include "prmon.h" -#ifdef NSPR20 #ifdef XP_MAC #include "prpriv.h" /* for MonitorEntryCount */ #else #include "private/prpriv.h" #endif -#endif /* NSPR20 */ #if defined(JAVA) || defined(NS_MT_SUPPORTED) diff --git a/mozilla/include/proto.h b/mozilla/include/proto.h index 3b1c05c5adb..32f16d9ca7c 100644 --- a/mozilla/include/proto.h +++ b/mozilla/include/proto.h @@ -31,12 +31,6 @@ #include "ntypes.h" #include "lo_ele.h" -#ifndef NSPR20 -#if defined(__sun) -# include "sunos4.h" -#endif /* __sun */ -#endif /* NSPR20 */ - XP_BEGIN_PROTOS /* put your prototypes here..... */ diff --git a/mozilla/include/shistele.h b/mozilla/include/shistele.h index 6f9a1f90fe8..70ac2cedf03 100644 --- a/mozilla/include/shistele.h +++ b/mozilla/include/shistele.h @@ -33,7 +33,7 @@ typedef struct SHIST_SavedData { void* FormList; /* layout data to recreate forms */ void* EmbedList; /* layout data to recreate embeds and applets */ void* Grid; /* layout data to recreate grids */ -#ifdef MOCHA + void* Window; /* window object for grid being resized */ /* XXX none of this would be necessary if frameset docs were reparsed */ @@ -48,7 +48,7 @@ typedef struct SHIST_SavedData { void* OnMove; /* JavaScript onmove event handler source */ void* OnResize; /* JavaScript onresize event handler source */ void* style_stack; /* JSSS style stack info */ -#endif + } SHIST_SavedData; /* diff --git a/mozilla/include/structs.h b/mozilla/include/structs.h index 01aa980de57..166e168f50e 100644 --- a/mozilla/include/structs.h +++ b/mozilla/include/structs.h @@ -224,7 +224,7 @@ struct MWContext_ { in Browser windows too.) */ /* Also overloaded by progress module to hold private crap! */ -#ifdef MOCHA + struct JSContext *mocha_context; /* opaque handle to Mocha state */ uint32 event_bit; /* sum of all event capturing objects */ XP_Bool js_drag_enabled; /* indicates JS drag enabled */ @@ -233,7 +233,7 @@ struct MWContext_ { MWContext *js_parent; int32 js_timeouts_pending; /* Number of pending JavaScript timeouts */ -#endif + XP_Bool restricted_target; /* TRUE if window is off-limits for opening links into from mail or other window-grabbing functions.*/ diff --git a/mozilla/include/xp_core.h b/mozilla/include/xp_core.h index 00e69522fa2..42036433575 100644 --- a/mozilla/include/xp_core.h +++ b/mozilla/include/xp_core.h @@ -234,10 +234,6 @@ typedef int (*FARPROC)(); #define _INT32 #define _UINT32 -#ifndef NSPR20 -typedef int intn; -#endif /* NSPR20 */ - /* function classifications */ #define PUBLIC