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;