Commit 4fa17211 authored by Andy Polyakov's avatar Andy Polyakov Committed by Emilia Kasper
Browse files

e_os.h: refine inline override logic (to address warnings in debug build). 



Reviewed-by: default avatarDr Stephen Henson <steve@openssl.org>
(cherry picked from commit 55c7a4cf)
parent d8d40fc6

e_os.h

+3 −3
Original line number Diff line number Diff line
@@ -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