From 2c43816a1ce69be5ecbd9ad6b017e70f1dd76fcc Mon Sep 17 00:00:00 2001
From: gewlitys <gewlitys@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 21 Jul 2003 04:10:58 +0000
Subject: [PATCH] ..and changed intptr back to intptr_t, this time hopefully
 avoiding all conflicts

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1077 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/libs/sound/mixsdl/mixer.h  |  2 +-
 sc2/src/sc2code/libs/sound/sound_chooser.h |  2 +-
 sc2/src/types.h                            | 18 ++++++------------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/sc2/src/sc2code/libs/sound/mixsdl/mixer.h b/sc2/src/sc2code/libs/sound/mixsdl/mixer.h
index b1915eeb4..d2475692b 100644
--- a/sc2/src/sc2code/libs/sound/mixsdl/mixer.h
+++ b/sc2/src/sc2code/libs/sound/mixsdl/mixer.h
@@ -158,7 +158,7 @@ typedef enum
  *  Interface Types
  */
 
-typedef intptr mixSDL_Object;
+typedef intptr_t mixSDL_Object;
 typedef int mixSDL_IntVal;
 
 typedef struct _mixSDL_Buffer
diff --git a/sc2/src/sc2code/libs/sound/sound_chooser.h b/sc2/src/sc2code/libs/sound/sound_chooser.h
index 605dfdc25..69c44ffff 100644
--- a/sc2/src/sc2code/libs/sound/sound_chooser.h
+++ b/sc2/src/sc2code/libs/sound/sound_chooser.h
@@ -39,7 +39,7 @@
  *  Interface Types
  */
 
-typedef intptr TFBSound_Object;
+typedef intptr_t TFBSound_Object;
 typedef int TFBSound_IntVal;
 typedef const int TFBSound_SourceProp;
 typedef const int TFBSound_BufferProp;
diff --git a/sc2/src/types.h b/sc2/src/types.h
index c2cea16a2..d600b3cf2 100644
--- a/sc2/src/types.h
+++ b/sc2/src/types.h
@@ -22,6 +22,12 @@
 #ifndef _TYPES_H
 #define _TYPES_H
 
+#ifdef _MSC_VER
+#	include <stddef.h>
+#else
+#	include <stdint.h>
+#endif
+
 #if defined(__MACOS__)
 
 #	define UQM_INT16   short
@@ -101,18 +107,6 @@ typedef struct
 #undef UQM_INT16
 #undef UQM_INT32
 
-#ifdef WIN32
-typedef sint32 intptr;
-#elif defined (WIN64) || defined (_WIN64)
-typedef sint64 intptr;
-#else
-#	if __WORDSIZE == 64
-typedef sint64 intptr;
-#	else
-typedef sint32 intptr;
-	#endif
-#endif
-
 /* Make sure the types really have the right sizes
  * Adapted from SDL
  * This will generate "negative subscript or subscript is too large"