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/float/encode_frame_FLP.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/float/encode_frame_FLP.c')
| -rw-r--r-- | silk/float/encode_frame_FLP.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/silk/float/encode_frame_FLP.c b/silk/float/encode_frame_FLP.c index 32216866..29bdc542 100644 --- a/silk/float/encode_frame_FLP.c +++ b/silk/float/encode_frame_FLP.c @@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "tuning_parameters.h" /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate */ -static inline void silk_LBRR_encode_FLP( +static OPUS_INLINE void silk_LBRR_encode_FLP( silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ silk_encoder_control_FLP *psEncCtrl, /* I/O Encoder control FLP */ const silk_float xfw[], /* I Input signal */ @@ -316,7 +316,7 @@ opus_int silk_encode_frame_FLP( } /* Low-Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode excitation at lower bitrate */ -static inline void silk_LBRR_encode_FLP( +static OPUS_INLINE void silk_LBRR_encode_FLP( silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ silk_encoder_control_FLP *psEncCtrl, /* I/O Encoder control FLP */ const silk_float xfw[], /* I Input signal */ |