From 4ff9cbe635c28109bc395346c25148170b4d491b Mon Sep 17 00:00:00 2001 From: Emilia Kasper Date: Tue, 19 Aug 2014 13:18:07 +0200 Subject: [PATCH] define inline for Visual Studio In Visual Studio, inline is available in C++ only, however __inline is available for C, see http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx Reviewed-by: Richard Levitte Reviewed-by: Dr Stephen Henson (cherry picked from commit f511b25a7370c775dc9fd6198dbacd1706cf242b) --- e_os.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/e_os.h b/e_os.h index a6db8d9da0..919fec8f28 100644 --- a/e_os.h +++ b/e_os.h @@ -376,7 +376,16 @@ static unsigned int _strlen31(const char *str) # define check_winnt() (1) #else # define check_winnt() (GetVersion() < 0x80000000) -#endif +#endif + +/* + * Visual Studio: inline is available in C++ only, however + * __inline is available for C, see + * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx + */ +#if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline) +# define inline __inline +#endif #else /* The non-microsoft world */ @@ -750,4 +759,3 @@ struct servent *getservbyname(const char *name, const char *proto); #endif #endif - -- 2.25.1