remove old NSPR20 #ifdefs
git-svn-id: svn://10.0.0.236/trunk@11249 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
12f69944f4
commit
0c0e7341ef
@ -419,25 +419,20 @@ extern "C++" {
|
||||
/**
|
||||
** farproc for non-windows platforms
|
||||
**/
|
||||
#ifdef NSPR20
|
||||
|
||||
#ifndef NLS_WIN
|
||||
|
||||
#ifndef XP_UNIX
|
||||
#define FARPROC void*
|
||||
#else
|
||||
#include "md/_unixos.h"
|
||||
#endif
|
||||
#endif /* XP_UNIX */
|
||||
|
||||
#endif
|
||||
#else
|
||||
#ifdef NLS_UNIX
|
||||
#include "prunixos.h"
|
||||
#endif
|
||||
#endif
|
||||
#endif /* NLS_WIN */
|
||||
|
||||
#ifdef NLS_WIN
|
||||
#define MODULE_PATH_LENGTH 255 /* maximum path+filename length for getting DLL names */
|
||||
#endif
|
||||
#endif /* NLS_WIN */
|
||||
|
||||
#ifdef NLS_WIN16
|
||||
NLS_BEGIN_PROTOS
|
||||
|
||||
@ -118,14 +118,9 @@ enum {
|
||||
/*typedef wchar_t UniChar; */
|
||||
/*#endif */
|
||||
|
||||
#ifdef NSPR20
|
||||
|
||||
/** Unicode string offset */
|
||||
/*#if sizeof(int) >= 32 */
|
||||
/*typedef int TextOffset; */
|
||||
/*#else */
|
||||
typedef PRInt32 TextOffset;
|
||||
/*#endif */
|
||||
|
||||
/* Before compiling on a new platform, add a section for that platform, */
|
||||
/* defining the sized integral data types. */
|
||||
@ -137,25 +132,6 @@ typedef PRInt32 t_int32;
|
||||
typedef PRUint32 t_uint32;
|
||||
#define T_INT32_MAX (LONG_MAX)
|
||||
|
||||
#else
|
||||
/** Unicode string offset */
|
||||
/*#if sizeof(int) >= 32 */
|
||||
/*typedef int TextOffset; */
|
||||
/*#else */
|
||||
typedef int32 TextOffset;
|
||||
/*#endif */
|
||||
|
||||
/* Before compiling on a new platform, add a section for that platform, */
|
||||
/* defining the sized integral data types. */
|
||||
typedef int8 t_int8;
|
||||
typedef uint8 t_uint8;
|
||||
typedef int16 t_int16;
|
||||
typedef uint16 t_uint16;
|
||||
typedef int32 t_int32;
|
||||
typedef uint32 t_uint32;
|
||||
#define T_INT32_MAX (LONG_MAX)
|
||||
#define PR_INT32(x) x ## L
|
||||
#endif
|
||||
|
||||
/*=====================================================================================*/
|
||||
/* Calendar/TimeZone data types */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user