From 3533b5329a6edf49953bdd17a2d1e2552a7c8b7f Mon Sep 17 00:00:00 2001 From: gewlitys Date: Mon, 21 Jul 2003 02:07:07 +0000 Subject: [PATCH] Changed mixSDL_Object and TFBSound_Object to be intptr_t for 64bit compatibility (bug #252) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1075 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/libs/sound/mixsdl/mixer.h | 8 +++++++- sc2/src/sc2code/libs/sound/sound_chooser.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sc2/src/sc2code/libs/sound/mixsdl/mixer.h b/sc2/src/sc2code/libs/sound/mixsdl/mixer.h index 561c66aeb..42319fbae 100644 --- a/sc2/src/sc2code/libs/sound/mixsdl/mixer.h +++ b/sc2/src/sc2code/libs/sound/mixsdl/mixer.h @@ -23,6 +23,12 @@ #include "types.h" #include "SDL_byteorder.h" +#ifdef _MSC_VER +# include +#else +# include +#endif + /** * The interface heavily influenced by OpenAL * to the point where you should use OpenAL's @@ -158,7 +164,7 @@ typedef enum * Interface Types */ -typedef unsigned int 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 ddd8a281d..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 unsigned int TFBSound_Object; +typedef intptr_t TFBSound_Object; typedef int TFBSound_IntVal; typedef const int TFBSound_SourceProp; typedef const int TFBSound_BufferProp;