From 6638710b9e9f9e7d3b6b9b0ba60799576876e653 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 30 Oct 2014 14:49:31 +0100 Subject: [PATCH] webp/types.h: use inline for clang++/-std=c++11 at least clang 3.[45] in c++ mode with -std=c++11 define __STRICT_ANSI__ this change set WEBP_INLINE to inline for c++/non-strict-ansi/> c99 fixes crbug.com/428383 Change-Id: Ief2b934353c336a75865c73c90cc3dc5e4f83913 --- src/webp/types.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/webp/types.h b/src/webp/types.h index 6281b3b7..98fff35a 100644 --- a/src/webp/types.h +++ b/src/webp/types.h @@ -18,10 +18,11 @@ #ifndef _MSC_VER #include -#ifdef __STRICT_ANSI__ -#define WEBP_INLINE -#else /* __STRICT_ANSI__ */ +#if defined(__cplusplus) || !defined(__STRICT_ANSI__) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) #define WEBP_INLINE inline +#else +#define WEBP_INLINE #endif #else typedef signed char int8_t;