diff options
| author | Gregory Maxwell <greg@xiph.org> | 2013-10-17 15:56:52 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2013-10-28 10:18:54 -0700 |
| commit | 7830cf1bd2c71bad9aa296254cf5c5f9842e8b8e (patch) | |
| tree | 53f28e34554bee867a239849b96283bec549a607 /silk/shell_coder.c | |
| parent | 2891d852a38b3acb1810fad9f26ba7e0b181cfb2 (diff) | |
| download | opus-7830cf1bd2c71bad9aa296254cf5c5f9842e8b8e.tar.gz | |
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/shell_coder.c')
| -rw-r--r-- | silk/shell_coder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/silk/shell_coder.c b/silk/shell_coder.c index 9fe5e40f..796f57d6 100644 --- a/silk/shell_coder.c +++ b/silk/shell_coder.c @@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. /* shell coder; pulse-subframe length is hardcoded */ -static inline void combine_pulses( +static OPUS_INLINE void combine_pulses( opus_int *out, /* O combined pulses vector [len] */ const opus_int *in, /* I input vector [2 * len] */ const opus_int len /* I number of OUTPUT samples */ @@ -45,7 +45,7 @@ static inline void combine_pulses( } } -static inline void encode_split( +static OPUS_INLINE void encode_split( ec_enc *psRangeEnc, /* I/O compressor data structure */ const opus_int p_child1, /* I pulse amplitude of first child subframe */ const opus_int p, /* I pulse amplitude of current subframe */ @@ -57,7 +57,7 @@ static inline void encode_split( } } -static inline void decode_split( +static OPUS_INLINE void decode_split( opus_int *p_child1, /* O pulse amplitude of first child subframe */ opus_int *p_child2, /* O pulse amplitude of second child subframe */ ec_dec *psRangeDec, /* I/O Compressor data structure */ |