diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-08-14 23:14:19 +0900 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2018-08-16 11:52:38 +1000 |
| commit | eaa0ad97872ac1becf437c14909afe7a01b77364 (patch) | |
| tree | 00403152ff5b9186061f99e0e4635706a2ce1dcf /deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h | |
| parent | 45b9f5df6ff1548f01ed646ebee75e3f0873cefd (diff) | |
| download | android-node-v8-eaa0ad97872ac1becf437c14909afe7a01b77364.tar.gz android-node-v8-eaa0ad97872ac1becf437c14909afe7a01b77364.tar.bz2 android-node-v8-eaa0ad97872ac1becf437c14909afe7a01b77364.zip | |
deps: update archs files for OpenSSL-1.1.0i
`cd deps/openssl/config; make` updates all archs dependant files.
PR-URL: https://github.com/nodejs/node/pull/22318
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h')
| -rw-r--r-- | deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h index f53c3d3eb7..cd3e29a4f3 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE |