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 /celt/arch.h | |
parent | 2891d852a38b3acb1810fad9f26ba7e0b181cfb2 (diff) | |
download | libopus-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 'celt/arch.h')
-rw-r--r-- | celt/arch.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/celt/arch.h b/celt/arch.h index f9c98567..3a2985c3 100644 --- a/celt/arch.h +++ b/celt/arch.h @@ -35,6 +35,7 @@ #define ARCH_H #include "opus_types.h" +#include "opus_defines.h" # if !defined(__GNUC_PREREQ) # if defined(__GNUC__)&&defined(__GNUC_MINOR__) @@ -54,7 +55,7 @@ #ifdef __GNUC__ __attribute__((noreturn)) #endif -static inline void _celt_fatal(const char *str, const char *file, int line) +static OPUS_INLINE void _celt_fatal(const char *str, const char *file, int line) { fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str); abort(); |