From 9880f63038a5b9bb8bf5becc18360378cfe7806d Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Tue, 30 Sep 2014 21:05:33 +0200 Subject: [PATCH] e_os.h: refine inline override logic (to address warnings in debug build). Reviewed-by: Dr Stephen Henson (cherry picked from commit 55c7a4cf112bf154ed405ee05a6b7924b6b1ba92) --- e_os.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e_os.h b/e_os.h index 960959a486..ca4044b647 100644 --- a/e_os.h +++ b/e_os.h @@ -275,7 +275,7 @@ extern "C" { # ifdef _WIN64 # define strlen(s) _strlen31(s) /* cut strings to 2GB */ -static unsigned int _strlen31(const char *str) +static __inline unsigned int _strlen31(const char *str) { unsigned int len=0; while (*str && len<0x80000000U) str++, len++; @@ -705,8 +705,8 @@ struct servent *getservbyname(const char *name, const char *proto); #if !defined(inline) && !defined(__cplusplus) # if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L /* do nothing, inline works */ -# elif defined(__GNUC__) && __GNUC__>=3 && !defined(__NO_INLINE__) - /* do nothing, inline works */ +# elif defined(__GNUC__) && __GNUC__>=2 +# define inline __inline__ # elif defined(_MSC_VER) /* * Visual Studio: inline is available in C++ only, however -- 2.25.1