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/stack_alloc.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/stack_alloc.h')
| -rw-r--r-- | celt/stack_alloc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/celt/stack_alloc.h b/celt/stack_alloc.h index 1c093a8c..76be6006 100644 --- a/celt/stack_alloc.h +++ b/celt/stack_alloc.h @@ -32,6 +32,9 @@ #ifndef STACK_ALLOC_H #define STACK_ALLOC_H +#include "opus_types.h" +#include "opus_defines.h" + #if (!defined (VAR_ARRAYS) && !defined (USE_ALLOCA) && !defined (NONTHREADSAFE_PSEUDOSTACK)) #error "Opus requires one of VAR_ARRAYS, USE_ALLOCA, or NONTHREADSAFE_PSEUDOSTACK be defined to select the temporary allocation mode." #endif @@ -159,7 +162,7 @@ extern char *global_stack_top; #else -static inline int _opus_false(void) {return 0;} +static OPUS_INLINE int _opus_false(void) {return 0;} #define OPUS_CHECK_ARRAY(ptr, len) _opus_false() #define OPUS_CHECK_VALUE(value) _opus_false() #define OPUS_PRINT_INT(value) do{}while(0) |