diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-11-27 18:37:49 +0300 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-11-27 19:56:41 +0300 |
| commit | 574407a67f5d42d22aac57a128448997c674c3e5 (patch) | |
| tree | 41b29dfe4690415b379b222ce2efdd5cd9d97c72 /deps/openssl/openssl/e_os.h | |
| parent | 7efc64dc94aab8cee73c243ab901513005de00ed (diff) | |
| download | android-node-v8-574407a67f5d42d22aac57a128448997c674c3e5.tar.gz android-node-v8-574407a67f5d42d22aac57a128448997c674c3e5.tar.bz2 android-node-v8-574407a67f5d42d22aac57a128448997c674c3e5.zip | |
deps: update openssl to 1.0.1j
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: https://github.com/iojs/io.js/pull/1
Diffstat (limited to 'deps/openssl/openssl/e_os.h')
| -rw-r--r-- | deps/openssl/openssl/e_os.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/deps/openssl/openssl/e_os.h b/deps/openssl/openssl/e_os.h index 6a0aad1de7..733155e48d 100644 --- a/deps/openssl/openssl/e_os.h +++ b/deps/openssl/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 - |