зеркало из https://github.com/mozilla/gecko-dev.git
removing old NSPR20 and MOCHA #ifdefs. Sorry for the rebuild.
This commit is contained in:
cyeh%netscape.com
Родитель
17f4c00bfc
Коммит
edbbeddce9
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; /* <A HREF="http://gagan/PrefetchingThoughts.html" PRE=0.5> */
|
||||
};
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -176,9 +176,6 @@
|
|||
#ifdef macintosh
|
||||
#include <stdio.h>
|
||||
#include "xp_mcom.h"
|
||||
#ifndef NSPR20
|
||||
#include "prmacos.h"
|
||||
#endif
|
||||
#define BIG_ENDIAN 4321
|
||||
#define LITTLE_ENDIAN 1234
|
||||
#define BYTE_ORDER BIG_ENDIAN
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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..... */
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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.*/
|
||||
|
||||
|
|
|
|||
|
|
@ -234,10 +234,6 @@ typedef int (*FARPROC)();
|
|||
#define _INT32
|
||||
#define _UINT32
|
||||
|
||||
#ifndef NSPR20
|
||||
typedef int intn;
|
||||
#endif /* NSPR20 */
|
||||
|
||||
/* function classifications */
|
||||
|
||||
#define PUBLIC
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче