From 65cb3326e30ef8a67eb1d4411ec563e91be6e9ae Mon Sep 17 00:00:00 2001 From: Kunihiko Sakamoto Date: Tue, 28 Oct 2014 19:37:13 +0900 Subject: [PATCH] Allow use of inline keyword in c++/c99 mode --- brotli/dec/types.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/brotli/dec/types.h b/brotli/dec/types.h index bc09f8b..2f79b2a 100644 --- a/brotli/dec/types.h +++ b/brotli/dec/types.h @@ -22,10 +22,11 @@ #ifndef _MSC_VER #include -#ifdef __STRICT_ANSI__ -#define BROTLI_INLINE -#else /* __STRICT_ANSI__ */ +#if defined(__cplusplus) || !defined(__STRICT_ANSI__) \ + || __STDC_VERSION__ >= 199901L #define BROTLI_INLINE inline +#else +#define BROTLI_INLINE #endif #else typedef signed char int8_t;