diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
| commit | 5f6cb652dbd2ef0879673cf7338520dc2be236b9 (patch) | |
| tree | bc47c8ccbcd48bfc5aee6b404c8ef3f1d9a359cb /app/openssl/e_os.h | |
| parent | 576b0c26baf9b5b1418650a572604325ca7fb3af (diff) | |
| parent | f347c871d0433ef3efb85beb5e386b58d700faad (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/openssl/e_os.h')
| -rw-r--r-- | app/openssl/e_os.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/openssl/e_os.h b/app/openssl/e_os.h index 6a0aad1d..733155e4 100644 --- a/app/openssl/e_os.h +++ b/app/openssl/e_os.h @@ -373,7 +373,16 @@ static unsigned int _strlen31(const char *str) # define check_winnt() (1) #else # define check_winnt() (GetVersion() < 0x80000000) -#endif +#endif + +/* + * Visual Studio: inline is available in C++ only, however + * __inline is available for C, see + * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx + */ +#if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline) +# define inline __inline +#endif #else /* The non-microsoft world */ @@ -738,4 +747,3 @@ struct servent *getservbyname(const char *name, const char *proto); #endif #endif - |