generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Reviewed-by: Dr Stephen Henson <steve@openssl.org>
(cherry picked from commit 55c7a4cf112bf154ed405ee05a6b7924b6b1ba92)
This commit is contained in:
Andy Polyakov 2014-09-30 21:05:33 +02:00 committed by Emilia Kasper
parent 56cee260d8
commit 2d2965d2c1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e_os.h
View File

@ -291,7 +291,7 @@ extern "C" {
# ifdef _WIN64 # ifdef _WIN64
# define strlen(s) _strlen31(s) # define strlen(s) _strlen31(s)
/* cut strings to 2GB */ /* cut strings to 2GB */
static unsigned int _strlen31(const char *str) static __inline unsigned int _strlen31(const char *str)
{ {
unsigned int len=0; unsigned int len=0;
while (*str && len<0x80000000U) str++, len++; while (*str && len<0x80000000U) str++, len++;
@ -747,8 +747,8 @@ struct servent *getservbyname(const char *name, const char *proto);
#if !defined(inline) && !defined(__cplusplus) #if !defined(inline) && !defined(__cplusplus)
# if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L # if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
/* do nothing, inline works */ /* do nothing, inline works */
# elif defined(__GNUC__) && __GNUC__>=3 && !defined(__NO_INLINE__) # elif defined(__GNUC__) && __GNUC__>=2
/* do nothing, inline works */ # define inline __inline__
# elif defined(_MSC_VER) # elif defined(_MSC_VER)
/* /*
* Visual Studio: inline is available in C++ only, however * Visual Studio: inline is available in C++ only, however