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/typedef.h | |
| 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/typedef.h')
| -rw-r--r-- | silk/typedef.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/silk/typedef.h b/silk/typedef.h index 6394cde8..97b7e709 100644 --- a/silk/typedef.h +++ b/silk/typedef.h @@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. #define SILK_TYPEDEF_H #include "opus_types.h" +#include "opus_defines.h" #ifndef FIXED_POINT # include <float.h> @@ -63,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifdef __GNUC__ __attribute__((noreturn)) #endif -static inline void _silk_fatal(const char *str, const char *file, int line) +static OPUS_INLINE void _silk_fatal(const char *str, const char *file, int line) { fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str); abort(); |