gosu 1.4.5.pre1 → 1.4.5

data/dependencies/SDL_sound/dr_mp3.h

@@ -1,6 +1,6 @@
 /*
 MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
-dr_mp3 - v0.6.32 - 2021-12-11
+dr_mp3 - v0.6.34 - 2022-09-17
 
 David Reid - mackron@gmail.com
 
@@ -95,7 +95,7 @@ extern "C" {
 
 #define DRMP3_VERSION_MAJOR     0
 #define DRMP3_VERSION_MINOR     6
-#define DRMP3_VERSION_REVISION  32
+#define DRMP3_VERSION_REVISION  34
 #define DRMP3_VERSION_STRING    DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION)
 
 #include <stddef.h> /* For size_t. */
@@ -235,9 +235,15 @@ typedef drmp3_int32 drmp3_result;
     I am using "__inline__" only when we're compiling in strict ANSI mode.
     */
     #if defined(__STRICT_ANSI__)
-        #define DRMP3_INLINE __inline__ __attribute__((always_inline))
+        #define DRMP3_GNUC_INLINE_HINT __inline__
     #else
-        #define DRMP3_INLINE inline __attribute__((always_inline))
+        #define DRMP3_GNUC_INLINE_HINT inline
+    #endif
+
+    #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)) || defined(__clang__)
+        #define DRMP3_INLINE DRMP3_GNUC_INLINE_HINT __attribute__((always_inline))
+    #else
+        #define DRMP3_INLINE DRMP3_GNUC_INLINE_HINT
     #endif
 #elif defined(__WATCOMC__)
     #define DRMP3_INLINE __inline
@@ -340,7 +346,6 @@ typedef struct
 typedef struct
 {
     drmp3dec decoder;
-    drmp3dec_frame_info frameInfo;
     drmp3_uint32 channels;
     drmp3_uint32 sampleRate;
     drmp3_read_proc onRead;
@@ -595,7 +600,7 @@ DRMP3_API const char* drmp3_version_string(void)
 #define DR_MP3_ONLY_SIMD
 #endif
 
-#if ((defined(_MSC_VER) && _MSC_VER >= 1400) && (defined(_M_IX86) || defined(_M_X64))) || ((defined(__i386__) || defined(__x86_64__)) && defined(__SSE2__))
+#if ((defined(_MSC_VER) && _MSC_VER >= 1400) && defined(_M_X64)) || ((defined(__i386) || defined(_M_IX86) || defined(__i386__) || defined(__x86_64__)) && ((defined(_M_IX86_FP) && _M_IX86_FP == 2) || defined(__SSE2__)))
 #if defined(_MSC_VER)
 #include <intrin.h>
 #endif
@@ -1296,7 +1301,7 @@ static void drmp3_L3_huffman(float *dst, drmp3_bs *bs, const drmp3_L3_gr_info *g
     static const drmp3_int16 tabindex[2*16] = { 0,32,64,98,0,132,180,218,292,364,426,538,648,746,0,1126,1460,1460,1460,1460,1460,1460,1460,1460,1842,1842,1842,1842,1842,1842,1842,1842 };
     static const drmp3_uint8 g_linbits[] =  { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,6,8,10,13,4,5,6,7,8,9,11,13 };
 
-#define DRMP3_PEEK_BITS(n)    (bs_cache >> (32 - n))
+#define DRMP3_PEEK_BITS(n)    (bs_cache >> (32 - (n)))
 #define DRMP3_FLUSH_BITS(n)   { bs_cache <<= (n); bs_sh += (n); }
 #define DRMP3_CHECK_BITS      while (bs_sh >= 0) { bs_cache |= (drmp3_uint32)*bs_next_ptr++ << bs_sh; bs_sh -= 8; }
 #define DRMP3_BSPOS           ((bs_next_ptr - bs->buf)*8 - 24 + bs_sh)
@@ -1864,7 +1869,7 @@ static void drmp3d_DCT_II(float *grbuf, int n)
 #if DRMP3_HAVE_SSE
 #define DRMP3_VSAVE2(i, v) _mm_storel_pi((__m64 *)(void*)&y[i*18], v)
 #else
-#define DRMP3_VSAVE2(i, v) vst1_f32((float32_t *)&y[i*18],  vget_low_f32(v))
+#define DRMP3_VSAVE2(i, v) vst1_f32((float32_t *)&y[(i)*18],  vget_low_f32(v))
 #endif
             for (i = 0; i < 7; i++, y += 4*18)
             {
@@ -1880,7 +1885,7 @@ static void drmp3d_DCT_II(float *grbuf, int n)
             DRMP3_VSAVE2(3, t[3][7]);
         } else
         {
-#define DRMP3_VSAVE4(i, v) DRMP3_VSTORE(&y[i*18], v)
+#define DRMP3_VSAVE4(i, v) DRMP3_VSTORE(&y[(i)*18], v)
             for (i = 0; i < 7; i++, y += 4*18)
             {
                 drmp3_f4 s = DRMP3_VADD(t[3][i], t[3][i + 1]);
@@ -2103,7 +2108,11 @@ static void drmp3d_synth(float *xl, drmp3d_sample_t *dstl, int nch, float *lins)
             vst1_lane_s16(dstl + (49 + i)*nch, pcmb, 2);
 #endif
 #else
+        #if DRMP3_HAVE_SSE
             static const drmp3_f4 g_scale = { 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f };
+        #else
+            const drmp3_f4 g_scale = vdupq_n_f32(1.0f/32768.0f);
+        #endif
             a = DRMP3_VMUL(a, g_scale);
             b = DRMP3_VMUL(b, g_scale);
 #if DRMP3_HAVE_SSE
@@ -2406,8 +2415,6 @@ DRMP3_API void drmp3dec_f32_to_s16(const float *in, drmp3_int16 *out, size_t num
  Main Public API
 
  ************************************************************************************************************************************************************/
-#include <math.h>   /* For sin() and exp(). */
-
 #if defined(SIZE_MAX)
     #define DRMP3_SIZE_MAX  SIZE_MAX
 #else
@@ -2427,7 +2434,7 @@ DRMP3_API void drmp3dec_f32_to_s16(const float *in, drmp3_int16 *out, size_t num
 
 /* The size in bytes of each chunk of data to read from the MP3 stream. minimp3 recommends at least 16K, but in an attempt to reduce data movement I'm making this slightly larger. */
 #ifndef DRMP3_DATA_CHUNK_SIZE
-#define DRMP3_DATA_CHUNK_SIZE  DRMP3_MIN_DATA_CHUNK_SIZE*4
+#define DRMP3_DATA_CHUNK_SIZE  (DRMP3_MIN_DATA_CHUNK_SIZE*4)
 #endif
 
 
@@ -2472,24 +2479,6 @@ static DRMP3_INLINE drmp3_uint32 drmp3_gcf_u32(drmp3_uint32 a, drmp3_uint32 b)
 }
 
 
-static DRMP3_INLINE double drmp3_sin(double x)
-{
-    /* TODO: Implement custom sin(x). */
-    return sin(x);
-}
-
-static DRMP3_INLINE double drmp3_exp(double x)
-{
-    /* TODO: Implement custom exp(x). */
-    return exp(x);
-}
-
-static DRMP3_INLINE double drmp3_cos(double x)
-{
-    return drmp3_sin((DRMP3_PI_D*0.5) - x);
-}
-
-
 static void* drmp3__malloc_default(size_t sz, void* pUserData)
 {
     (void)pUserData;
@@ -3434,10 +3423,23 @@ static drmp3_result drmp3_wfopen(FILE** ppFile, const wchar_t* pFilePath, const
     }
 #else
     /*
-    Use fopen() on anything other than Windows. Requires a conversion. This is annoying because fopen() is locale specific. The only real way I can
-    think of to do this is with wcsrtombs(). Note that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for
-    maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler error I'll look into improving compatibility.
+    Use fopen() on anything other than Windows. Requires a conversion. This is annoying because
+	fopen() is locale specific. The only real way I can think of to do this is with wcsrtombs(). Note
+	that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for
+    maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler
+	error I'll look into improving compatibility.
     */
+
+	/*
+	Some compilers don't support wchar_t or wcsrtombs() which we're using below. In this case we just
+	need to abort with an error. If you encounter a compiler lacking such support, add it to this list
+	and submit a bug report and it'll be added to the library upstream.
+	*/
+	#if defined(__DJGPP__)
+	{
+		/* Nothing to do here. This will fall through to the error check below. */
+	}
+	#else
     {
         mbstate_t mbs;
         size_t lenMB;
@@ -3479,6 +3481,7 @@ static drmp3_result drmp3_wfopen(FILE** ppFile, const wchar_t* pFilePath, const
 
         drmp3__free_from_callbacks(pFilePathMB, pAllocationCallbacks);
     }
+	#endif
 
     if (*ppFile == NULL) {
         return DRMP3_ERROR;
@@ -4473,6 +4476,16 @@ counts rather than sample counts.
 /*
 REVISION HISTORY
 ================
+v0.6.34 - 2022-09-17
+  - Fix compilation with DJGPP.
+  - Fix compilation when compiling with x86 with no SSE2.
+  - Remove an unnecessary variable from the drmp3 structure.
+
+v0.6.33 - 2022-04-10
+  - Fix compilation error with the MSVC ARM64 build.
+  - Fix compilation error on older versions of GCC.
+  - Remove some unused functions.
+
 v0.6.32 - 2021-12-11
   - Fix a warning with Clang.
 

data/dependencies/SDL_sound/libmodplug/fastmix.c

@@ -9,9 +9,7 @@
 #include <math.h>
 
 #include "SDL_stdinc.h"
-#if !(defined(HAVE_LIBC) && defined(__WATCOMC__)) /* Watcom has issues... */
 #define floor SDL_floor
-#endif
 
 /*
  *-----------------------------------------------------------------------------
@@ -246,18 +244,18 @@ void init_modplug_filters(void)
 // ----------------------------------------------------------------------------
 #define SNDMIX_BEGINSAMPLELOOP8\
 	register MODCHANNEL * const pChn = pChannel;\
-	nPos = pChn->nPosLo;\
 	const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\
-	if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
 	int *pvol = pbuffer;\
+	nPos = pChn->nPosLo;\
+	if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
 	do {
 
 #define SNDMIX_BEGINSAMPLELOOP16\
 	register MODCHANNEL * const pChn = pChannel;\
-	nPos = pChn->nPosLo;\
 	const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\
-	if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
 	int *pvol = pbuffer;\
+	nPos = pChn->nPosLo;\
+	if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
 	do {
 
 #define SNDMIX_ENDSAMPLELOOP\
@@ -338,15 +336,16 @@ void init_modplug_filters(void)
     int poshi  = nPos >> 16;\
     int poslo  = (nPos & 0xFFFF);\
     int firidx = ((poslo+WFIR_FRACHALVE)>>WFIR_FRACSHIFT) & WFIR_FRACMASK; \
-    int vol1   = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[poshi+1-4]);	\
+    int vol1, vol2, vol;						\
+        vol1   = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[poshi+1-4]);	\
         vol1  += (CzWINDOWEDFIR_lut[firidx+1]*(int)p[poshi+2-4]);	\
         vol1  += (CzWINDOWEDFIR_lut[firidx+2]*(int)p[poshi+3-4]);	\
         vol1  += (CzWINDOWEDFIR_lut[firidx+3]*(int)p[poshi+4-4]);	\
-    int vol2   = (CzWINDOWEDFIR_lut[firidx+4]*(int)p[poshi+5-4]);	\
+        vol2   = (CzWINDOWEDFIR_lut[firidx+4]*(int)p[poshi+5-4]);	\
 	vol2  += (CzWINDOWEDFIR_lut[firidx+5]*(int)p[poshi+6-4]);	\
 	vol2  += (CzWINDOWEDFIR_lut[firidx+6]*(int)p[poshi+7-4]);	\
 	vol2  += (CzWINDOWEDFIR_lut[firidx+7]*(int)p[poshi+8-4]);	\
-    int vol    = ((vol1>>1)+(vol2>>1)) >> (WFIR_16BITSHIFT-1);
+        vol    = ((vol1>>1)+(vol2>>1)) >> (WFIR_16BITSHIFT-1);
 
 /////////////////////////////////////////////////////////////////////////////
 // Stereo
@@ -407,7 +406,8 @@ void init_modplug_filters(void)
     int poshi   = nPos >> 16;\
     int poslo   = (nPos & 0xFFFF);\
     int firidx  = ((poslo+WFIR_FRACHALVE)>>WFIR_FRACSHIFT) & WFIR_FRACMASK; \
-    int vol_l   = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[(poshi+1-4)*2  ]);   \
+    int vol_l, vol_r;							   \
+        vol_l   = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[(poshi+1-4)*2  ]);   \
 	vol_l  += (CzWINDOWEDFIR_lut[firidx+1]*(int)p[(poshi+2-4)*2  ]);   \
 	vol_l  += (CzWINDOWEDFIR_lut[firidx+2]*(int)p[(poshi+3-4)*2  ]);   \
         vol_l  += (CzWINDOWEDFIR_lut[firidx+3]*(int)p[(poshi+4-4)*2  ]);   \
@@ -416,7 +416,7 @@ void init_modplug_filters(void)
 	vol_l  += (CzWINDOWEDFIR_lut[firidx+6]*(int)p[(poshi+7-4)*2  ]);   \
         vol_l  += (CzWINDOWEDFIR_lut[firidx+7]*(int)p[(poshi+8-4)*2  ]);   \
 	vol_l >>= WFIR_8SHIFT; \
-    int vol_r   = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[(poshi+1-4)*2+1]);   \
+        vol_r   = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[(poshi+1-4)*2+1]);   \
 	vol_r  += (CzWINDOWEDFIR_lut[firidx+1]*(int)p[(poshi+2-4)*2+1]);   \
 	vol_r  += (CzWINDOWEDFIR_lut[firidx+2]*(int)p[(poshi+3-4)*2+1]);   \
 	vol_r  += (CzWINDOWEDFIR_lut[firidx+3]*(int)p[(poshi+4-4)*2+1]);   \
@@ -430,24 +430,25 @@ void init_modplug_filters(void)
     int poshi   = nPos >> 16;\
     int poslo   = (nPos & 0xFFFF);\
     int firidx  = ((poslo+WFIR_FRACHALVE)>>WFIR_FRACSHIFT) & WFIR_FRACMASK; \
-    int vol1_l  = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[(poshi+1-4)*2  ]);   \
+    int vol1_l, vol2_l, vol_l, vol1_r, vol2_r, vol_r;			   \
+        vol1_l  = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[(poshi+1-4)*2  ]);   \
 	vol1_l += (CzWINDOWEDFIR_lut[firidx+1]*(int)p[(poshi+2-4)*2  ]);   \
         vol1_l += (CzWINDOWEDFIR_lut[firidx+2]*(int)p[(poshi+3-4)*2  ]);   \
 	vol1_l += (CzWINDOWEDFIR_lut[firidx+3]*(int)p[(poshi+4-4)*2  ]);   \
-   int vol2_l  = (CzWINDOWEDFIR_lut[firidx+4]*(int)p[(poshi+5-4)*2  ]);    \
+       vol2_l  = (CzWINDOWEDFIR_lut[firidx+4]*(int)p[(poshi+5-4)*2  ]);    \
        vol2_l += (CzWINDOWEDFIR_lut[firidx+5]*(int)p[(poshi+6-4)*2  ]);    \
        vol2_l += (CzWINDOWEDFIR_lut[firidx+6]*(int)p[(poshi+7-4)*2  ]);    \
        vol2_l += (CzWINDOWEDFIR_lut[firidx+7]*(int)p[(poshi+8-4)*2  ]);    \
-   int vol_l   = ((vol1_l>>1)+(vol2_l>>1)) >> (WFIR_16BITSHIFT-1); \
-   int vol1_r  = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[(poshi+1-4)*2+1]);    \
+       vol_l   = ((vol1_l>>1)+(vol2_l>>1)) >> (WFIR_16BITSHIFT-1); \
+       vol1_r  = (CzWINDOWEDFIR_lut[firidx+0]*(int)p[(poshi+1-4)*2+1]);    \
        vol1_r += (CzWINDOWEDFIR_lut[firidx+1]*(int)p[(poshi+2-4)*2+1]);    \
        vol1_r += (CzWINDOWEDFIR_lut[firidx+2]*(int)p[(poshi+3-4)*2+1]);    \
        vol1_r += (CzWINDOWEDFIR_lut[firidx+3]*(int)p[(poshi+4-4)*2+1]);    \
-   int vol2_r  = (CzWINDOWEDFIR_lut[firidx+4]*(int)p[(poshi+5-4)*2+1]);    \
+       vol2_r  = (CzWINDOWEDFIR_lut[firidx+4]*(int)p[(poshi+5-4)*2+1]);    \
        vol2_r += (CzWINDOWEDFIR_lut[firidx+5]*(int)p[(poshi+6-4)*2+1]);    \
        vol2_r += (CzWINDOWEDFIR_lut[firidx+6]*(int)p[(poshi+7-4)*2+1]);    \
        vol2_r += (CzWINDOWEDFIR_lut[firidx+7]*(int)p[(poshi+8-4)*2+1]);    \
-   int vol_r   = ((vol1_r>>1)+(vol2_r>>1)) >> (WFIR_16BITSHIFT-1);
+       vol_r   = ((vol1_r>>1)+(vol2_r>>1)) >> (WFIR_16BITSHIFT-1);
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -462,10 +463,12 @@ void init_modplug_filters(void)
 	pvol += 2;
 
 #define SNDMIX_STOREFASTMONOVOL\
+    do { \
 	int v = vol * pChn->nRightVol;\
 	pvol[0] += v;\
 	pvol[1] += v;\
-	pvol += 2;
+	pvol += 2; \
+    } while (0);
 
 #define SNDMIX_RAMPMONOVOL\
 	nRampLeftVol += pChn->nLeftRamp;\
@@ -476,10 +479,12 @@ void init_modplug_filters(void)
 
 #define SNDMIX_RAMPFASTMONOVOL\
 	nRampRightVol += pChn->nRightRamp;\
+    do { \
 	int fastvol = vol * (nRampRightVol >> VOLUMERAMPPRECISION);\
 	pvol[0] += fastvol;\
 	pvol[1] += fastvol;\
-	pvol += 2;
+	pvol += 2; \
+    } while (0);
 
 #define SNDMIX_RAMPSTEREOVOL\
 	nRampLeftVol += pChn->nLeftRamp;\
@@ -1319,6 +1324,7 @@ static LONG MPPFASTCALL GetSampleCount(MODCHANNEL *pChn, LONG nSamples)
 {
 	LONG nLoopStart = (pChn->dwFlags & CHN_LOOP) ? pChn->nLoopStart : 0;
 	LONG nInc = pChn->nInc;
+	LONG nPos, nPosLo, nSmpCount;
 
 	if ((nSamples <= 0) || (!nInc) || (!pChn->nLength)) return 0;
 	// Under zero ?
@@ -1357,6 +1363,7 @@ static LONG MPPFASTCALL GetSampleCount(MODCHANNEL *pChn, LONG nSamples)
 		if (!(pChn->dwFlags & CHN_LOOP)) return 0; // not looping -> stop this channel
 		if (pChn->dwFlags & CHN_PINGPONGLOOP)
 		{
+			LONG nDeltaHi, nDeltaLo;
 			// Invert loop
 			if (nInc > 0)
 			{
@@ -1365,8 +1372,8 @@ static LONG MPPFASTCALL GetSampleCount(MODCHANNEL *pChn, LONG nSamples)
 			}
 			pChn->dwFlags |= CHN_PINGPONGFLAG;
 			// adjust loop position
-			LONG nDeltaHi = (pChn->nPos - pChn->nLength);
-			LONG nDeltaLo = 0x10000 - (pChn->nPosLo & 0xffff);
+			nDeltaHi = (pChn->nPos - pChn->nLength);
+			nDeltaLo = 0x10000 - (pChn->nPosLo & 0xffff);
 			pChn->nPos = pChn->nLength - nDeltaHi - (nDeltaLo>>16);
 			pChn->nPosLo = nDeltaLo & 0xffff;
 			if ((pChn->nPos <= pChn->nLoopStart) ||
@@ -1385,23 +1392,24 @@ static LONG MPPFASTCALL GetSampleCount(MODCHANNEL *pChn, LONG nSamples)
 				pChn->nPos = pChn->nLoopStart;
 		}
 	}
-	LONG nPos = pChn->nPos;
+	nPos = pChn->nPos;
 	// too big increment, and/or too small loop length
 	if (nPos < nLoopStart)
 	{
 		if ((nPos < 0) || (nInc < 0)) return 0;
 	}
 	if ((nPos < 0) || (nPos >= (LONG)pChn->nLength)) return 0;
-	LONG nPosLo = (USHORT)pChn->nPosLo, nSmpCount = nSamples;
+	nPosLo = (USHORT)pChn->nPosLo, nSmpCount = nSamples;
 	if (nInc < 0)
 	{
 		LONG nInv = -nInc;
 		LONG maxsamples = 16384 / ((nInv>>16)+1);
+		LONG nDeltaHi, nDeltaLo, nPosDest;
 		if (maxsamples < 2) maxsamples = 2;
 		if (nSamples > maxsamples) nSamples = maxsamples;
-		LONG nDeltaHi = (nInv>>16) * (nSamples - 1);
-		LONG nDeltaLo = (nInv&0xffff) * (nSamples - 1);
-		LONG nPosDest = nPos - nDeltaHi + ((nPosLo - nDeltaLo) >> 16);
+		nDeltaHi = (nInv>>16) * (nSamples - 1);
+		nDeltaLo = (nInv&0xffff) * (nSamples - 1);
+		nPosDest = nPos - nDeltaHi + ((nPosLo - nDeltaLo) >> 16);
 		if (nPosDest < nLoopStart)
 		{
 			nSmpCount = (ULONG)(((((LONGLONG)nPos - nLoopStart) << 16) + nPosLo - 1) / nInv) + 1;
@@ -1409,11 +1417,12 @@ static LONG MPPFASTCALL GetSampleCount(MODCHANNEL *pChn, LONG nSamples)
 	} else
 	{
 		LONG maxsamples = 16384 / ((nInc>>16)+1);
+		LONG nDeltaHi, nDeltaLo, nPosDest;
 		if (maxsamples < 2) maxsamples = 2;
 		if (nSamples > maxsamples) nSamples = maxsamples;
-		LONG nDeltaHi = (nInc>>16) * (nSamples - 1);
-		LONG nDeltaLo = (nInc&0xffff) * (nSamples - 1);
-		LONG nPosDest = nPos + nDeltaHi + ((nPosLo + nDeltaLo)>>16);
+		nDeltaHi = (nInc>>16) * (nSamples - 1);
+		nDeltaLo = (nInc&0xffff) * (nSamples - 1);
+		nPosDest = nPos + nDeltaHi + ((nPosLo + nDeltaLo)>>16);
 		if (nPosDest >= (LONG)pChn->nLength)
 		{
 			nSmpCount = (ULONG)(((((LONGLONG)pChn->nLength - nPos) << 16) - nPosLo - 1) / nInc) + 1;
@@ -1430,12 +1439,12 @@ UINT CSoundFile_CreateStereoMix(CSoundFile *_this, int count)
 {
 	LPLONG pOfsL, pOfsR;
 	DWORD nchused, nchmixed;
-	UINT nrampsamples;
+	UINT nrampsamples, nChn;
 
 	if (!count) return 0;
 	if (_this->gnChannels > 2) X86_InitMixBuffer(_this->MixRearBuffer, count*2);
 	nchused = nchmixed = 0;
-	for (UINT nChn=0; nChn<_this->m_nMixChannels; nChn++)
+	for (nChn=0; nChn<_this->m_nMixChannels; nChn++)
 	{
 		const LPMIXINTERFACE *pMixFuncTable;
 		MODCHANNEL * const pChannel = &_this->Chn[_this->ChnMix[nChn]];
@@ -1443,6 +1452,7 @@ UINT CSoundFile_CreateStereoMix(CSoundFile *_this, int count)
 		LONG nSmpCount;
 		int nsamples;
 		int *pbuffer;
+		UINT naddmix;
 
 		if (!pChannel->pCurrentSample) continue;
 		//nMasterCh = (_this->ChnMix[nChn] < _this->m_nChannels) ? _this->ChnMix[nChn]+1 : pChannel->nMasterChn;
@@ -1510,7 +1520,6 @@ UINT CSoundFile_CreateStereoMix(CSoundFile *_this, int count)
 			continue;
 		}
 		// Should we mix this channel ?
-		UINT naddmix;
 		if (((nchmixed >= _this->m_nMaxMixChannels) && (!(_this->gdwSoundSetup & SNDMIX_DIRECTTODISK)))
 		 || ((!pChannel->nRampLength) && (!(pChannel->nLeftVol|pChannel->nRightVol))))
 		{
@@ -1525,8 +1534,9 @@ UINT CSoundFile_CreateStereoMix(CSoundFile *_this, int count)
 		{
 			// Choose function for mixing
 			LPMIXINTERFACE pMixFunc;
+			int *pbufmax;
 			pMixFunc = (pChannel->nRampLength) ? pMixFuncTable[nFlags|MIXNDX_RAMP] : pMixFuncTable[nFlags];
-			int *pbufmax = pbuffer + (nSmpCount*2);
+			pbufmax = pbuffer + (nSmpCount*2);
 			pChannel->nROfs = - *(pbufmax-2);
 			pChannel->nLOfs = - *(pbufmax-1);
 			pMixFunc(pChannel, pbuffer, pbufmax);
@@ -1567,7 +1577,8 @@ DWORD MPPASMCALL X86_Convert32To8(LPVOID lp8, int *pBuffer, DWORD lSampleCount,
 {
 	int vumin = *lpMin, vumax = *lpMax;
 	unsigned char *p = (unsigned char *)lp8;
-	for (UINT i=0; i<lSampleCount; i++)
+	UINT i;
+	for (i=0; i<lSampleCount; i++)
 	{
 		int n = pBuffer[i];
 		if (n < MIXING_CLIPMIN)
@@ -1593,7 +1604,8 @@ DWORD MPPASMCALL X86_Convert32To16(LPVOID lp16, int *pBuffer, DWORD lSampleCount
 {
 	int vumin = *lpMin, vumax = *lpMax;
 	signed short *p = (signed short *)lp16;
-	for (UINT i=0; i<lSampleCount; i++)
+	UINT i;
+	for (i=0; i<lSampleCount; i++)
 	{
 		int n = pBuffer[i];
 		if (n < MIXING_CLIPMIN)
@@ -1689,8 +1701,8 @@ void MPPASMCALL X86_InterleaveFrontRear(int *pFrontBuf, int *pRearBuf, DWORD nSa
 //---GCCFIX: Asm replaced with C function
 VOID MPPASMCALL X86_MonoFromStereo(int *pMixBuf, UINT nSamples)
 {
-	UINT j;
-	for(UINT i = 0; i < nSamples; i++)
+	UINT i, j;
+	for(i = 0; i < nSamples; i++)
 	{
 		j = i << 1;
 		pMixBuf[i] = (pMixBuf[j] + pMixBuf[j + 1]) >> 1;
@@ -1705,13 +1717,14 @@ void MPPASMCALL X86_StereoFill(int *pBuffer, UINT nSamples, LPLONG lpROfs, LPLON
 {
 	int rofs = *lpROfs;
 	int lofs = *lpLOfs;
+	UINT i;
 
 	if ((!rofs) && (!lofs))
 	{
 		X86_InitMixBuffer(pBuffer, nSamples*2);
 		return;
 	}
-	for (UINT i=0; i<nSamples; i++)
+	for (i=0; i<nSamples; i++)
 	{
 		int x_r = (rofs + (((-rofs)>>31) & OFSDECAYMASK)) >> OFSDECAYSHIFT;
 		int x_l = (lofs + (((-lofs)>>31) & OFSDECAYMASK)) >> OFSDECAYSHIFT;
@@ -1730,9 +1743,10 @@ static void MPPASMCALL X86_EndChannelOfs(MODCHANNEL *pChannel, int *pBuffer, UIN
 {
 	int rofs = pChannel->nROfs;
 	int lofs = pChannel->nLOfs;
+	UINT i;
 
 	if ((!rofs) && (!lofs)) return;
-	for (UINT i=0; i<nSamples; i++)
+	for (i=0; i<nSamples; i++)
 	{
 		int x_r = (rofs + (((-rofs)>>31) & OFSDECAYMASK)) >> OFSDECAYSHIFT;
 		int x_l = (lofs + (((-lofs)>>31) & OFSDECAYMASK)) >> OFSDECAYSHIFT;

data/dependencies/SDL_sound/libmodplug/libmodplug.h

@@ -12,16 +12,6 @@
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
-#if defined(HAVE_LIBC) && defined(__WATCOMC__) /* Watcom has issues... */
-#define SDL_cos  cos
-#define SDL_fabs fabs
-#define SDL_log  log
-#define SDL_pow  pow
-#define SDL_sin  sin
-#define SDL_sinf sin
-#define SDL_abs  abs
-#endif
-
 #ifdef _WIN32
 
 #ifdef _MSC_VER
@@ -58,8 +48,6 @@ typedef const char* LPCSTR;
 typedef void* PVOID;
 typedef void VOID;
 
-#define LPCTSTR LPCSTR
-
 #ifndef FALSE
 #define FALSE	0
 #endif

data/dependencies/SDL_sound/libmodplug/load_669.c

@@ -50,17 +50,19 @@ BOOL CSoundFile_Read669(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLeng
 	const FILEHEADER669 *pfh = (const FILEHEADER669 *)lpStream;
 	const SAMPLE669 *psmp = (const SAMPLE669 *)(lpStream + 0x1F1);
 	DWORD dwMemPos = 0;
+	DWORD donttouchme;
+	UINT i;
 
 	if ((!lpStream) || (dwMemLength < sizeof(FILEHEADER669))) return FALSE;
 	if ((bswapLE16(pfh->sig) != 0x6669) && (bswapLE16(pfh->sig) != 0x4E4A)) return FALSE;
 //	b669Ext = (bswapLE16(pfh->sig) == 0x4E4A) ? TRUE : FALSE;
 	if ((!pfh->samples) || (pfh->samples > 64) || (pfh->restartpos >= 128)
 	 || (!pfh->patterns) || (pfh->patterns > 128)) return FALSE;
-	DWORD donttouchme = 0x1F1 + pfh->samples * sizeof(SAMPLE669) + pfh->patterns * 0x600;
+	donttouchme = 0x1F1 + pfh->samples * sizeof(SAMPLE669) + pfh->patterns * 0x600;
 	if (donttouchme > dwMemLength) return FALSE;
-	for (UINT ichk=0; ichk<pfh->samples; ichk++)
+	for (i=0; i<pfh->samples; i++)
 	{
-		DWORD len = lengthArrayToDWORD(psmp[ichk].length);
+		DWORD len = lengthArrayToDWORD(psmp[i].length);
 		donttouchme += len;
 	}
 	if (donttouchme > dwMemLength) return FALSE;
@@ -73,7 +75,7 @@ BOOL CSoundFile_Read669(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLeng
 	_this->m_nDefaultSpeed = 6;
 	_this->m_nChannels = 8;
 	_this->m_nSamples = pfh->samples;
-	for (UINT nins=1; nins<=_this->m_nSamples; nins++, psmp++)
+	for (i=1; i<=_this->m_nSamples; i++, psmp++)
 	{
 		DWORD len = lengthArrayToDWORD(psmp->length);
 		DWORD loopstart = lengthArrayToDWORD(psmp->loopstart);
@@ -82,45 +84,48 @@ BOOL CSoundFile_Read669(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLeng
 		if ((loopend > len) && (!loopstart)) loopend = 0;
 		if (loopend > len) loopend = len;
 		if (loopstart + 4 >= loopend) loopstart = loopend = 0;
-		_this->Ins[nins].nLength = len;
-		_this->Ins[nins].nLoopStart = loopstart;
-		_this->Ins[nins].nLoopEnd = loopend;
-		if (loopend) _this->Ins[nins].uFlags |= CHN_LOOP;
-		_this->Ins[nins].nVolume = 256;
-		_this->Ins[nins].nGlobalVol = 64;
-		_this->Ins[nins].nPan = 128;
+		_this->Ins[i].nLength = len;
+		_this->Ins[i].nLoopStart = loopstart;
+		_this->Ins[i].nLoopEnd = loopend;
+		if (loopend) _this->Ins[i].uFlags |= CHN_LOOP;
+		_this->Ins[i].nVolume = 256;
+		_this->Ins[i].nGlobalVol = 64;
+		_this->Ins[i].nPan = 128;
 	}
 	// Reading Orders
 	SDL_memcpy(_this->Order, pfh->orders, 128);
 	_this->m_nRestartPos = pfh->restartpos;
 	if (_this->Order[_this->m_nRestartPos] >= pfh->patterns) _this->m_nRestartPos = 0;
 	// Reading Pattern Break Locations
-	for (UINT npan=0; npan<8; npan++)
+	for (i=0; i<8; i++)
 	{
-		_this->ChnSettings[npan].nPan = (npan & 1) ? 0x30 : 0xD0;
-		_this->ChnSettings[npan].nVolume = 64;
+		_this->ChnSettings[i].nPan = (i & 1) ? 0x30 : 0xD0;
+		_this->ChnSettings[i].nVolume = 64;
 	}
 	// Reading Patterns
 	dwMemPos = 0x1F1 + pfh->samples * 25;
-	for (UINT npat=0; npat<pfh->patterns; npat++)
+	for (i=0; i<pfh->patterns; i++)
 	{
-		_this->Patterns[npat] = CSoundFile_AllocatePattern(64, _this->m_nChannels);
-		if (!_this->Patterns[npat]) break;
-		_this->PatternSize[npat] = 64;
-		MODCOMMAND *m = _this->Patterns[npat];
-		const BYTE *p = lpStream + dwMemPos;
-		for (UINT row=0; row<64; row++)
+		MODCOMMAND *m;
+		const BYTE *p;
+		UINT row, j;
+		_this->Patterns[i] = CSoundFile_AllocatePattern(64, _this->m_nChannels);
+		if (!_this->Patterns[i]) break;
+		_this->PatternSize[i] = 64;
+		m = _this->Patterns[i];
+		p = lpStream + dwMemPos;
+		for (row=0; row<64; row++)
 		{
 			MODCOMMAND *mspeed = m;
-			if ((row == pfh->breaks[npat]) && (row != 63))
+			if ((row == pfh->breaks[i]) && (row != 63))
 			{
-				for (UINT i=0; i<8; i++)
+				for (j=0; j<8; j++)
 				{
-					m[i].command = CMD_PATTERNBREAK;
-					m[i].param = 0;
+					m[j].command = CMD_PATTERNBREAK;
+					m[j].param = 0;
 				}
 			}
-			for (UINT n=0; n<8; n++, m++, p+=3)
+			for (j=0; j<8; j++, m++, p+=3)
 			{
 				UINT note = p[0] >> 2;
 				UINT instr = ((p[0] & 0x03) << 4) | (p[1] >> 4);
@@ -163,10 +168,10 @@ BOOL CSoundFile_Read669(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLeng
 			}
 			if ((!row) && (mspeed))
 			{
-				for (UINT i=0; i<8; i++) if (!mspeed[i].command)
+				for (j=0; j<8; j++) if (!mspeed[j].command)
 				{
-					mspeed[i].command = CMD_SPEED;
-					mspeed[i].param = pfh->tempolist[npat];
+					mspeed[j].command = CMD_SPEED;
+					mspeed[j].param = pfh->tempolist[j];
 					break;
 				}
 			}
@@ -174,11 +179,11 @@ BOOL CSoundFile_Read669(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLeng
 		dwMemPos += 0x600;
 	}
 	// Reading Samples
-	for (UINT n=1; n<=_this->m_nSamples; n++)
+	for (i=1; i<=_this->m_nSamples; i++)
 	{
-		UINT len = _this->Ins[n].nLength;
+		UINT len = _this->Ins[i].nLength;
 		if (dwMemPos >= dwMemLength) break;
-		if (len > 4) CSoundFile_ReadSample(_this, &_this->Ins[n], RS_PCM8U, (LPSTR)(lpStream+dwMemPos), dwMemLength - dwMemPos);
+		if (len > 4) CSoundFile_ReadSample(_this, &_this->Ins[i], RS_PCM8U, (LPSTR)(lpStream+dwMemPos), dwMemLength - dwMemPos);
 		dwMemPos += len;
 	}
 	return TRUE;