diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-10-15 17:32:57 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-10-15 17:32:57 +0000 |
| commit | 58ab7656b2c140e06d60a7831a9f5b6e1ddc2fe5 (patch) | |
| tree | 6195ffd39cd3e0b3d6c711f6531b3e7e13b85b44 /e_os.h | |
| parent | cb6864802ed26a1031701a6a385961592a5cac25 (diff) | |
| download | src-58ab7656b2c140e06d60a7831a9f5b6e1ddc2fe5.tar.gz src-58ab7656b2c140e06d60a7831a9f5b6e1ddc2fe5.zip | |
Import OpenSSL 1.0.1j.vendor/openssl/1.0.1j
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=273138
svn path=/vendor-crypto/openssl/1.0.1j/; revision=273139; tag=vendor/openssl/1.0.1j
Diffstat (limited to 'e_os.h')
| -rw-r--r-- | e_os.h | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -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 - |