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 <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6470)
This commit is contained in:
parent
575045f59f
commit
973abf5230
1 changed files with 1 additions and 3 deletions
|
@ -68,9 +68,7 @@ extern "C" {
|
||||||
* still won't see them if the library has been built to disable deprecated
|
* still won't see them if the library has been built to disable deprecated
|
||||||
* functions.
|
* functions.
|
||||||
*/
|
*/
|
||||||
#if defined(OPENSSL_NO_DEPRECATED)
|
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
|
||||||
# define DECLARE_DEPRECATED(f)
|
|
||||||
#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
|
|
||||||
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
||||||
#else
|
#else
|
||||||
# define DECLARE_DEPRECATED(f) f;
|
# define DECLARE_DEPRECATED(f) f;
|
||||||
|
|
Loading…
Reference in a new issue