Fix for 247406 . r=wchang0222,glen.beasley

This commit is contained in:
jpierre%netscape.com 2004-06-18 01:28:41 +00:00
parent 30597b0bb2
commit 6aa648b89e

View File

@ -41,7 +41,7 @@
*
* NOTE - These are not public interfaces
*
* $Id: secport.h,v 1.9 2004/04/25 15:03:18 gerv%gerv.net Exp $
* $Id: secport.h,v 1.10 2004/06/18 01:28:41 jpierre%netscape.com Exp $
*/
#ifndef _SECPORT_H_
@ -134,6 +134,7 @@ extern void PORT_FreeBlock(void *ptr);
extern void *PORT_ZAlloc(size_t len);
extern void PORT_Free(void *ptr);
extern void PORT_ZFree(void *ptr, size_t len);
extern char *PORT_Strdup(const char *s);
extern time_t PORT_Time(void);
extern void PORT_SetError(int value);
extern int PORT_GetError(void);
@ -169,36 +170,6 @@ extern char *PORT_ArenaStrdup(PLArenaPool *arena, const char *str);
#define PORT_ArenaZNewArray(poolp, type, num) \
(type*) PORT_ArenaZAlloc (poolp, sizeof(type)*(num))
/* Please, keep these defines sorted alphbetically. Thanks! */
#ifdef XP_STRING_FUNCS
#define PORT_Atoi XP_ATOI
#define PORT_Memcmp XP_MEMCMP
#define PORT_Memcpy XP_MEMCPY
#define PORT_Memmove XP_MEMMOVE
#define PORT_Memset XP_MEMSET
#define PORT_Strcasecmp XP_STRCASECMP
#define PORT_Strcat XP_STRCAT
#define PORT_Strchr XP_STRCHR
#define PORT_Strrchr XP_STRRCHR
#define PORT_Strcmp XP_STRCMP
#define PORT_Strcpy XP_STRCPY
#define PORT_Strdup XP_STRDUP
#define PORT_Strlen(s) XP_STRLEN(s)
#define PORT_Strncasecmp XP_STRNCASECMP
#define PORT_Strncat strncat
#define PORT_Strncmp XP_STRNCMP
#define PORT_Strncpy strncpy
#define PORT_Strstr XP_STRSTR
#define PORT_Strtok XP_STRTOK_R
#define PORT_Tolower XP_TO_LOWER
#else /* XP_STRING_FUNCS */
#define PORT_Atoi atoi
#define PORT_Memcmp memcmp
@ -216,7 +187,6 @@ extern char *PORT_ArenaStrdup(PLArenaPool *arena, const char *str);
#define PORT_Strrchr strrchr
#define PORT_Strcmp strcmp
#define PORT_Strcpy strcpy
extern char *PORT_Strdup(const char *s);
#define PORT_Strlen(s) strlen(s)
#define PORT_Strncasecmp PL_strncasecmp
#define PORT_Strncat strncat
@ -228,8 +198,6 @@ extern char *PORT_Strdup(const char *s);
#define PORT_Tolower tolower
#endif /* XP_STRING_FUNCS */
typedef PRBool (PR_CALLBACK * PORTCharConversionWSwapFunc) (PRBool toUnicode,
unsigned char *inBuf, unsigned int inBufLen,
unsigned char *outBuf, unsigned int maxOutBufLen,