From 7830cf1bd2c71bad9aa296254cf5c5f9842e8b8e Mon Sep 17 00:00:00 2001 From: Gregory Maxwell Date: Thu, 17 Oct 2013 15:56:52 -0700 Subject: Replace "inline" with OPUS_INLINE. Newer versions of MSVC are unhappy with the strategy of the build environment redefining "inline" (even though they don't support the actual keyword). Instead we define OPUS_INLINE to the right thing in opus_defines.h. This is the same approach we use for restrict. --- src/opus_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/opus_decoder.c') diff --git a/src/opus_decoder.c b/src/opus_decoder.c index ca95ed40..ff21767f 100644 --- a/src/opus_decoder.c +++ b/src/opus_decoder.c @@ -75,7 +75,7 @@ struct OpusDecoder { }; #ifdef FIXED_POINT -static inline opus_int16 SAT16(opus_int32 x) { +static OPUS_INLINE opus_int16 SAT16(opus_int32 x) { return x > 32767 ? 32767 : x < -32768 ? -32768 : (opus_int16)x; } #endif -- cgit v1.2.3