update NSPR to 4.24 and keep NSPR Bug 1586070 and win64 patch intact.

This commit is contained in:
Roy Tam 2020-01-03 13:34:04 +08:00
commit 0b9855b841
487 changed files with 42933 additions and 48679 deletions

View file

@ -13,7 +13,7 @@
#include <stdio.h>
PR_BEGIN_EXTERN_C
/*
/*
** Win16 stdio special case.
** To get stdio to work for Win16, all calls to printf() and related
** things must be called from the environment of the .EXE; calls to
@ -29,7 +29,7 @@ PR_BEGIN_EXTERN_C
** any application needing stdio for Win16.
**
** The address of these functions must be made available to the .DLL
** so he can call back to the .EXE. To do this, function
** so he can call back to the .EXE. To do this, function
** PR_MD_RegisterW16StdioCallbacks() is called from the .EXE.
** The arguments are the functions defined in w16stdio.c
** At runtime, MD_Write() calls the registered functions, if any
@ -50,11 +50,11 @@ typedef PRInt32 (PR_CALLBACK *PRStdoutWrite)( void *buf, PRInt32 amount);
typedef PRInt32 (PR_CALLBACK *PRStderrWrite)( void *buf, PRInt32 amount);
NSPR_API(PRStatus)
PR_MD_RegisterW16StdioCallbacks(
PR_MD_RegisterW16StdioCallbacks(
PRStdinRead inReadf, /* i: function pointer for stdin read */
PRStdoutWrite outWritef, /* i: function pointer for stdout write */
PRStderrWrite errWritef /* i: function pointer for stderr write */
);
);
NSPR_API(PRInt32)
_PL_W16StdioWrite( void *buf, PRInt32 amount );
@ -79,37 +79,37 @@ struct PRMethodCallbackStr {
void (PR_CALLBACK *free)( void *ptr );
void * (PR_CALLBACK *getenv)( const char *name);
int (PR_CALLBACK *putenv)( const char *assoc);
/* void * (PR_CALLBACK *perror)( const char *prefix ); */
/* void * (PR_CALLBACK *perror)( const char *prefix ); */
};
NSPR_API(void) PR_MDRegisterCallbacks(struct PRMethodCallbackStr *);
int PR_CALLBACK _PL_W16CallBackPuts( const char *outputString );
size_t PR_CALLBACK _PL_W16CallBackStrftime(
char *s,
size_t len,
size_t PR_CALLBACK _PL_W16CallBackStrftime(
char *s,
size_t len,
const char *fmt,
const struct tm *p );
void * PR_CALLBACK _PL_W16CallBackMalloc( size_t size );
void * PR_CALLBACK _PL_W16CallBackCalloc( size_t n, size_t size );
void * PR_CALLBACK _PL_W16CallBackRealloc(
void *old_blk,
void * PR_CALLBACK _PL_W16CallBackRealloc(
void *old_blk,
size_t size );
void PR_CALLBACK _PL_W16CallBackFree( void *ptr );
void * PR_CALLBACK _PL_W16CallBackGetenv( const char *name );
int PR_CALLBACK _PL_W16CallBackPutenv( const char *assoc );
/*
** Hackery!
** Hackery!
**
** These functions are provided as static link points.
** This is to satisfy the quick port of Gromit to NSPR 2.0
** ... Don't do this! ... alas, It may never go away.
**
**
*/
NSPR_API(int) PR_MD_printf(const char *, ...);
NSPR_API(void) PR_MD_exit(int);
NSPR_API(size_t) PR_MD_strftime(char *, size_t, const char *, const struct tm *);
NSPR_API(size_t) PR_MD_strftime(char *, size_t, const char *, const struct tm *);
NSPR_API(int) PR_MD_sscanf(const char *, const char *, ...);
NSPR_API(void*) PR_MD_malloc( size_t size );
NSPR_API(void*) PR_MD_calloc( size_t n, size_t size );