diff options
| author | Gregory Maxwell <greg@xiph.org> | 2013-10-18 02:56:52 +0400 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2013-10-28 21:18:54 +0400 |
| commit | 7830cf1bd2c71bad9aa296254cf5c5f9842e8b8e (patch) | |
| tree | 53f28e34554bee867a239849b96283bec549a607 /silk/encode_pulses.c | |
| parent | 2891d852a38b3acb1810fad9f26ba7e0b181cfb2 (diff) | |
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.
Diffstat (limited to 'silk/encode_pulses.c')
| -rw-r--r-- | silk/encode_pulses.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/silk/encode_pulses.c b/silk/encode_pulses.c index d1b2f5dc..a4501438 100644 --- a/silk/encode_pulses.c +++ b/silk/encode_pulses.c @@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE. /* Encode quantization indices of excitation */ /*********************************************/ -static inline opus_int combine_and_check( /* return ok */ +static OPUS_INLINE opus_int combine_and_check( /* return ok */ opus_int *pulses_comb, /* O */ const opus_int *pulses_in, /* I */ opus_int max_pulses, /* I max value for sum of pulses */ |