diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-09-27 16:15:54 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-12-06 12:24:48 +0100 |
| commit | 478d4f912c001f18717d1364132184ff9d31f944 (patch) | |
| tree | b9117b81f66527f55486a88fb3f26d444b7692ad | |
| parent | Configure: allow building without things deprecated up to and including v3.0 (diff) | |
| download | openssl-478d4f912c001f18717d1364132184ff9d31f944.tar.xz openssl-478d4f912c001f18717d1364132184ff9d31f944.zip | |
include/openssl/opensslconf.h.in: allow future deprecation for v4.0
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7724)
| -rw-r--r-- | include/openssl/opensslconf.h.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index a364bfb1cc..12b16631e8 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -85,6 +85,18 @@ extern "C" { # define OPENSSL_API_COMPAT OPENSSL_MIN_API #endif +/* + * Do not deprecate things to be deprecated in version 4.0 before the + * OpenSSL version number matches. + */ +#if OPENSSL_VERSION_MAJOR < 4 +# define DEPRECATEDIN_4(f) f; +#elif OPENSSL_API_COMPAT < 0x40000000L +# define DEPRECATEDIN_4(f) DECLARE_DEPRECATED(f) +#else +# define DEPRECATEDIN_4(f) +#endif + #if OPENSSL_API_COMPAT < 0x30000000L # define DEPRECATEDIN_3(f) DECLARE_DEPRECATED(f) #else |