diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-08-10 20:22:29 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-08-10 20:22:29 -0700 |
| commit | f1b1e2ec71f50a00850db3a68c421a2d79bba115 (patch) | |
| tree | fccd86d01fb7d6bb7a7fabdc0b451cd113a71b9d /src/config.h.in | |
| parent | 735098e097ad62bdc4b1121c6c0c983eb7483485 (diff) | |
Don't include static in CMARK_INLINE.
ALso don't set CMARK_INLINE to __inline if we're compiling
under MSVC in cplusplus mode.
Diffstat (limited to 'src/config.h.in')
| -rw-r--r-- | src/config.h.in | 4 |
1 files changed, 2 insertions, 2 deletions
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 |