From 973abf52304b454e8f2220a11aa8b6c6512c44fb Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 12 Jun 2018 18:26:37 +0200 Subject: [PATCH] Configure option 'no-deprecated' means '-DOPENSSL_API_COMPAT=0x10100000L' (that is, until 1.2.0 comes along) Since we allow future deprecation (and that shouldn't be affected by 'no-deprecated'), we need to distinguish what to have deprecated on the value of OPENSSL_API_COMPAT, not the existence of OPENSSL_NO_DEPRECATED. Note that the macro OPENSSL_NO_DEPRECATED still exists, in case someone still uses it. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/6470) --- include/openssl/opensslconf.h.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index dc36a74f6d..96f791ec6c 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -68,9 +68,7 @@ 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) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); #else # define DECLARE_DEPRECATED(f) f; -- 2.40.0