diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-09-30 21:05:33 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2014-10-17 11:53:02 +0200 |
| commit | 4fa17211bbb4865954a633a33a9d20a998b96971 (patch) | |
| tree | b5bf33233006a644101aec97bea0608fe3b677a3 /e_os.h | |
| parent | d8d40fc676a9c5c3df01de07a296d718e88246a7 (diff) | |
e_os.h: refine inline override logic (to address warnings in debug build).
Reviewed-by: Dr Stephen Henson <steve@openssl.org>
(cherry picked from commit 55c7a4cf112bf154ed405ee05a6b7924b6b1ba92)
Diffstat (limited to 'e_os.h')
| -rw-r--r-- | e_os.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -290,7 +290,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++; @@ -735,8 +735,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 |