From 53e95716f5c11a8a9cbdcbbb3be0e8e538b5a2ea Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 17 Dec 2014 13:30:41 +0000 Subject: Change all instances of OPENSSL_NO_DEPRECATED to OPENSSL_USE_DEPRECATED Introduce use of DECLARE_DEPRECATED Reviewed-by: Rich Salz --- crypto/dh/dh.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crypto/dh') diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index beaeac9212..3f7dca1284 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -69,7 +69,7 @@ #include #endif #include -#ifndef OPENSSL_NO_DEPRECATED +#ifdef OPENSSL_USE_DEPRECATED #include #endif @@ -204,10 +204,10 @@ int DH_set_ex_data(DH *d, int idx, void *arg); void *DH_get_ex_data(DH *d, int idx); /* Deprecated version */ -#ifndef OPENSSL_NO_DEPRECATED -DH * DH_generate_parameters(int prime_len,int generator, - void (*callback)(int,int,void *),void *cb_arg); -#endif /* !defined(OPENSSL_NO_DEPRECATED) */ +#ifdef OPENSSL_USE_DEPRECATED +DECLARE_DEPRECATED(DH * DH_generate_parameters(int prime_len,int generator, + void (*callback)(int,int,void *),void *cb_arg)); +#endif /* defined(OPENSSL_USE_DEPRECATED) */ /* New version */ int DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb); -- cgit v1.2.3