From f83aaa72c965bebfc566a2ef820f3ca6a0069035 Mon Sep 17 00:00:00 2001
From: Martin Schaffner <schaffnerb@gmx.ch>
Date: Tue, 3 Aug 2004 20:27:32 +0000
Subject: [PATCH] This time, I correctly applied Chris Taylor's patch

---
 ChangeLog         |  4 ++++
 include/pstypes.h | 22 ++++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37a0a609..d4aa0410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-02  Martin Schaffner  <maschaffner@gmx.ch>
+
+	* include/pstypes.h: This time, I correctly applied Chris Taylor's patch
+
 2004-07-01  Chris Taylor  <c.taylor@student.curtin.edu.au>
 
 	* 2d/font.c, arch/ogl/gr.c, arch/ogl/ogl.c, mem/mem.c,
diff --git a/include/pstypes.h b/include/pstypes.h
index 8ce32ec0..2fe2df9b 100644
--- a/include/pstypes.h
+++ b/include/pstypes.h
@@ -1,4 +1,4 @@
-/* $Id: pstypes.h,v 1.30 2004-08-01 13:01:39 schaffner Exp $ */
+/* $Id: pstypes.h,v 1.31 2004-08-03 20:27:32 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -42,21 +42,27 @@ typedef unsigned short ushort;
 typedef unsigned int uint;
 #endif
 
-#if defined(_WIN32) || defined(__sun__)
+#if defined(_WIN32) || defined(__sun__) // platforms missing (u_)int??_t
 # include <SDL_types.h>
-#elif defined(macintosh)
+#elif defined(macintosh) // misses (u_)int??_t and does not like SDL_types.h
 # include <MacTypes.h>
-#endif
-#if defined(_WIN32) || defined(macintosh) // platforms missing int??_t
+ typedef SInt16 int16_t;
+ typedef SInt32 int32_t;
+ typedef SInt64 int64_t;
+ typedef UInt16 u_int16_t;
+ typedef UInt32 u_int32_t;
+ typedef UInt64 u_int64_t;
+#endif // macintosh
+#if defined(_WIN32) // platforms missing int??_t
  typedef Sint16 int16_t;
  typedef Sint32 int32_t;
  typedef Sint64 int64_t;
-#endif // defined(_WIN32) || defined(macintosh)
-#if defined(_WIN32) || defined(macintosh) || defined(__sun__) // platforms missing u_int??_t
+#endif // defined(_WIN32)
+#if defined(_WIN32) || defined(__sun__) // platforms missing u_int??_t
  typedef Uint16 u_int16_t;
  typedef Uint32 u_int32_t;
  typedef Uint64 u_int64_t;
-#endif // defined(_WIN32) || defined(macintosh) || defined(__sun__)
+#endif // defined(_WIN32) || defined(__sun__)
 
 #ifdef _MSC_VER
 # include <stdlib.h> // this is where min and max are defined
-- 
2.39.2