diff --git a/desmume/src/SPU.cpp b/desmume/src/SPU.cpp
index 4429bcbf1..fb69d36da 100644
--- a/desmume/src/SPU.cpp
+++ b/desmume/src/SPU.cpp
@@ -57,8 +57,8 @@ extern SoundInterface_struct *SNDCoreList[];
 
 
 
-static FORCEINLINE s32 sputrunc(float f) { return u32floor(f); }
-static FORCEINLINE s32 sputrunc(double d) { return u32floor(d); }
+static FORCEINLINE u32 sputrunc(float f) { return u32floor(f); }
+static FORCEINLINE u32 sputrunc(double d) { return u32floor(d); }
 static FORCEINLINE s32 spumuldiv7(s32 val, u8 multiplier) {
 	assert(multiplier <= 127);
 	return (multiplier == 127) ? val : ((val * multiplier) >> 7);
diff --git a/desmume/src/SPU.h b/desmume/src/SPU.h
index f7d4b2b32..36532c982 100644
--- a/desmume/src/SPU.h
+++ b/desmume/src/SPU.h
@@ -83,7 +83,7 @@ struct channel_struct
    double sampcnt;
    double sampinc;
    // ADPCM specific
-   int lastsampcnt;
+   u32 lastsampcnt;
    s16 pcm16b, pcm16b_last;
    int index;
    u16 x;