diff --git a/.gitignore b/.gitignore index bcbef240..6247cec7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,11 @@ _private/ +examples/build/vc6/ examples/build/vc15/ examples/build/bin/ tests/_build/bin/ tests/_build/res/output/ tests/_build/tcc/ +tests/_build/vc6/ tests/_build/vc15/ tools/_build/ *.vcxproj.user diff --git a/extras/speex_resampler/ma_speex_resampler.h b/extras/speex_resampler/ma_speex_resampler.h index e4978cdc..9d35fe7f 100644 --- a/extras/speex_resampler/ma_speex_resampler.h +++ b/extras/speex_resampler/ma_speex_resampler.h @@ -30,13 +30,18 @@ int ma_speex_resampler_get_expected_output_frame_count(SpeexResamplerState* st, #if defined(MINIAUDIO_SPEEX_RESAMPLER_IMPLEMENTATION) /* The Speex resampler uses "inline", which is not defined for C89. We need to define it here. */ -#if defined(__GNUC__) && !defined(_MSC_VER) - #if defined(__STRICT_ANSI__) - #if !defined(inline) - #define inline __inline__ __attribute__((always_inline)) - #define MA_SPEEX_INLINE_DEFINED +#if !defined(__cplusplus) + #if defined(__GNUC__) && !defined(_MSC_VER) + #if defined(__STRICT_ANSI__) + #if !defined(inline) + #define inline __inline__ __attribute__((always_inline)) + #define MA_SPEEX_INLINE_DEFINED + #endif #endif #endif + #if defined(_MSC_VER) && _MSC_VER <= 1200 /* 1200 = Visual Studio 6 */ + #define inline _inline + #endif #endif #if defined(_MSC_VER) && !defined(__clang__)