Commit f498c7f5 authored by David Reid's avatar David Reid

Silence some warnings with the Speex resampler.

parent b4a4d3af
...@@ -6,7 +6,22 @@ ...@@ -6,7 +6,22 @@
#define RANDOM_PREFIX ma_speex #define RANDOM_PREFIX ma_speex
#include "thirdparty/speex_resampler.h" #include "thirdparty/speex_resampler.h"
#define spx_uint64_t unsigned long long #ifdef _MSC_VER
#if defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wlanguage-extension-token"
#pragma GCC diagnostic ignored "-Wlong-long"
#pragma GCC diagnostic ignored "-Wc++11-long-long"
#endif
#define spx_uint64_t unsigned __int64
#if defined(__clang__)
#pragma GCC diagnostic pop
#endif
#else
#define MA_HAS_STDINT
#include <stdint.h>
#define spx_uint64_t uint64_t
#endif
int ma_speex_resampler_get_required_input_frame_count(SpeexResamplerState* st, spx_uint64_t out_len, spx_uint64_t* in_len); int ma_speex_resampler_get_required_input_frame_count(SpeexResamplerState* st, spx_uint64_t out_len, spx_uint64_t* in_len);
int ma_speex_resampler_get_expected_output_frame_count(SpeexResamplerState* st, spx_uint64_t in_len, spx_uint64_t* out_len); int ma_speex_resampler_get_expected_output_frame_count(SpeexResamplerState* st, spx_uint64_t in_len, spx_uint64_t* out_len);
...@@ -21,6 +36,7 @@ int ma_speex_resampler_get_expected_output_frame_count(SpeexResamplerState* st, ...@@ -21,6 +36,7 @@ int ma_speex_resampler_get_expected_output_frame_count(SpeexResamplerState* st,
#pragma warning(disable:4706) /* assignment within conditional expression */ #pragma warning(disable:4706) /* assignment within conditional expression */
#else #else
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-compare" /* comparison between signed and unsigned integer expressions */
#endif #endif
#include "thirdparty/resample.c" #include "thirdparty/resample.c"
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment