aboutsummaryrefslogtreecommitdiff
path: root/src/opus_private.h
diff options
context:
space:
mode:
authorGregory Maxwell <greg@xiph.org>2013-10-17 15:56:52 -0700
committerGregory Maxwell <greg@xiph.org>2013-10-28 10:18:54 -0700
commit7830cf1bd2c71bad9aa296254cf5c5f9842e8b8e (patch)
tree53f28e34554bee867a239849b96283bec549a607 /src/opus_private.h
parent2891d852a38b3acb1810fad9f26ba7e0b181cfb2 (diff)
downloadlibopus-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 'src/opus_private.h')
-rw-r--r--src/opus_private.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opus_private.h b/src/opus_private.h
index 042b641e..df526c22 100644
--- a/src/opus_private.h
+++ b/src/opus_private.h
@@ -107,7 +107,7 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data, opus_int32 le
opus_int32 *packet_offset, int soft_clip);
/* Make sure everything's aligned to sizeof(void *) bytes */
-static inline int align(int i)
+static OPUS_INLINE int align(int i)
{
return (i+(int)sizeof(void *)-1)&-(int)sizeof(void *);
}