From d6a0e8b8e1036f86c89df44cc4736167d021090b Mon Sep 17 00:00:00 2001
From: "waldemar%netscape.com"
 <waldemar%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 7 Jul 2001 01:37:30 +0000
Subject: [PATCH] Moved in size_t and ptrdiff_t

git-svn-id: svn://10.0.0.236/branches/JS2_DIKDIK_BRANCH@98848 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js2/src/systemtypes.h | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/mozilla/js2/src/systemtypes.h b/mozilla/js2/src/systemtypes.h
index ae33b7a54b3..9463006a88b 100644
--- a/mozilla/js2/src/systemtypes.h
+++ b/mozilla/js2/src/systemtypes.h
@@ -49,19 +49,18 @@ typedef signed char int8;
 typedef unsigned char uint8;
 typedef short int16;
 typedef unsigned short uint16;
-#if !defined(XP_MAC) && !defined(_WIN32)
- typedef int int32;
- typedef unsigned int uint32;
-#else
+#ifdef _WIN32
  typedef long int32;
  typedef unsigned long uint32;
-#endif
-#ifdef _WIN32
  typedef __int64 int64;
  typedef unsigned __int64 uint64;
 #else
+ typedef int int32;
+ typedef unsigned int uint32;
  typedef long long int64;
  typedef unsigned long long uint64;
+ using std::size_t;
+ using std::ptrdiff_t;
 #endif
 
 // Define this if the machine natively supports 64-bit integers
@@ -81,11 +80,7 @@ typedef float float32;
  typedef uint16 uchar16;
 #else
  typedef wchar_t char16;
- #ifndef _WIN32 // Microsoft VC6 bug: wchar_t should be a built-in type, not a typedef
-  typedef wchar_t uchar16;
- #else
-  typedef wchar_t uchar16;
- #endif
+ typedef wchar_t uchar16;
 #endif
 
 #ifdef _WIN32