working 64-bit literals for MSVC

This commit is contained in:
Josh Coalson
2003-01-08 08:04:42 +00:00
parent 1f208a89cc
commit 0c671c842e

View File

@@ -220,9 +220,8 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 data[],
sum += qlp_coeff[j] * (*(--history)); sum += qlp_coeff[j] * (*(--history));
#ifdef FLAC__OVERFLOW_DETECT #ifdef FLAC__OVERFLOW_DETECT
sumo += (FLAC__int64)qlp_coeff[j] * (FLAC__int64)(*history); sumo += (FLAC__int64)qlp_coeff[j] * (FLAC__int64)(*history);
#if defined _MSC_VER || defined __MINGW32__ /* don't know how to do 64-bit literals in VC++ */ #if defined _MSC_VER /* don't know how to do 64-bit literals in VC++ */
if(sumo < 0) sumo = -sumo; if(sumo > 2147483647I64 || sumo < -2147483648I64)
if(sumo > 2147483647)
#else #else
if(sumo > 2147483647ll || sumo < -2147483648ll) if(sumo > 2147483647ll || sumo < -2147483648ll)
#endif #endif
@@ -304,9 +303,8 @@ void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, c
sum += qlp_coeff[j] * (*(--history)); sum += qlp_coeff[j] * (*(--history));
#ifdef FLAC__OVERFLOW_DETECT #ifdef FLAC__OVERFLOW_DETECT
sumo += (FLAC__int64)qlp_coeff[j] * (FLAC__int64)(*history); sumo += (FLAC__int64)qlp_coeff[j] * (FLAC__int64)(*history);
#if defined _MSC_VER || defined __MINGW32__ /* don't know how to do 64-bit literals in VC++ */ #if defined _MSC_VER /* don't know how to do 64-bit literals in VC++ */
if(sumo < 0) sumo = -sumo; if(sumo > 2147483647I64 || sumo < -2147483648I64)
if(sumo > 2147483647)
#else #else
if(sumo > 2147483647ll || sumo < -2147483648ll) if(sumo > 2147483647ll || sumo < -2147483648ll)
#endif #endif