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>
This commit is contained in:
Andy Polyakov 2014-09-30 21:05:33 +02:00
parent 323154be33
commit 55c7a4cf11
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
e_os.h
View File

@ -274,7 +274,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++;
@ -657,6 +657,13 @@ extern char *sys_errlist[]; extern int sys_nerr;
#define DG_GCC_BUG /* gcc < 2.6.3 on DGUX */ #define DG_GCC_BUG /* gcc < 2.6.3 on DGUX */
#ifdef sgi
#define IRIX_CC_BUG /* all version of IRIX I've tested (4.* 5.*) */
#endif
#ifdef OPENSSL_SYS_SNI
#define IRIX_CC_BUG /* CDS++ up to V2.0Bsomething suffered from the same bug.*/
#endif
#if defined(OPENSSL_SYS_WINDOWS) #if defined(OPENSSL_SYS_WINDOWS)
# define strcasecmp _stricmp # define strcasecmp _stricmp
# define strncasecmp _strnicmp # define strncasecmp _strnicmp
@ -720,8 +727,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