From 179c8cc54bc34715244ceaca9972518f3f1c4d1f Mon Sep 17 00:00:00 2001 From: gewlitys Date: Mon, 21 Jul 2003 17:57:19 +0000 Subject: [PATCH] Changed mixSDL_IntVal and TFBSound_IntVal to intptr_t because they must be able to contain pointer to mixSDL_Buffer git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1080 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/libs/sound/mixsdl/mixer.h | 4 +++- sc2/src/sc2code/libs/sound/sound_chooser.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sc2/src/sc2code/libs/sound/mixsdl/mixer.h b/sc2/src/sc2code/libs/sound/mixsdl/mixer.h index d2475692b..2ae5081e5 100644 --- a/sc2/src/sc2code/libs/sound/mixsdl/mixer.h +++ b/sc2/src/sc2code/libs/sound/mixsdl/mixer.h @@ -159,7 +159,7 @@ typedef enum */ typedef intptr_t mixSDL_Object; -typedef int mixSDL_IntVal; +typedef intptr_t mixSDL_IntVal; typedef struct _mixSDL_Buffer { @@ -272,6 +272,8 @@ void mixSDL_BufferData (mixSDL_Object bufobj, uint32 format, void* data, MIX_COMPILE_TIME_ASSERT (mixSDL_Object, sizeof(mixSDL_Object) >= sizeof(void*)); +MIX_COMPILE_TIME_ASSERT (mixSDL_IntVal, + sizeof(mixSDL_IntVal) >= sizeof(mixSDL_Object)); #undef MIX_COMPILE_TIME_ASSERT diff --git a/sc2/src/sc2code/libs/sound/sound_chooser.h b/sc2/src/sc2code/libs/sound/sound_chooser.h index 69c44ffff..8376cd145 100644 --- a/sc2/src/sc2code/libs/sound/sound_chooser.h +++ b/sc2/src/sc2code/libs/sound/sound_chooser.h @@ -40,7 +40,7 @@ */ typedef intptr_t TFBSound_Object; -typedef int TFBSound_IntVal; +typedef intptr_t TFBSound_IntVal; typedef const int TFBSound_SourceProp; typedef const int TFBSound_BufferProp;