From f1b1e2ec71f50a00850db3a68c421a2d79bba115 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 10 Aug 2015 20:22:29 -0700 Subject: Don't include static in CMARK_INLINE. ALso don't set CMARK_INLINE to __inline if we're compiling under MSVC in cplusplus mode. --- src/config.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/config.h.in') diff --git a/src/config.h.in b/src/config.h.in index a392111..2792313 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -17,9 +17,9 @@ #endif #ifndef CMARK_INLINE - #ifdef _MSC_VER + #if defined(_MSC_VER) && !defined(__cplusplus) #define CMARK_INLINE __inline #else - #define CMARK_INLINE static inline + #define CMARK_INLINE inline #endif #endif -- cgit v1.2.3