diff options
| author | Matt Caswell <matt@openssl.org> | 2014-12-17 13:30:41 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-12-18 19:57:14 +0000 |
| commit | 53e95716f5c11a8a9cbdcbbb3be0e8e538b5a2ea (patch) | |
| tree | bc12310b023becd6c88c456b5b59a2b301eeed4d /crypto/crypto.h | |
| parent | 5bafb04d2e8a792afbc97395410ef3291f3fbc8b (diff) | |
| download | openssl-53e95716f5c11a8a9cbdcbbb3be0e8e538b5a2ea.tar.gz | |
Change all instances of OPENSSL_NO_DEPRECATED to OPENSSL_USE_DEPRECATED
Introduce use of DECLARE_DEPRECATED
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/crypto.h')
| -rw-r--r-- | crypto/crypto.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/crypto.h b/crypto/crypto.h index c4c173f6df..d4be37bf17 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -442,10 +442,14 @@ void CRYPTO_THREADID_current(CRYPTO_THREADID *id); int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, const CRYPTO_THREADID *b); void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, const CRYPTO_THREADID *src); unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id); -#ifndef OPENSSL_NO_DEPRECATED -void CRYPTO_set_id_callback(unsigned long (*func)(void)); +#ifdef OPENSSL_USE_DEPRECATED +DECLARE_DEPRECATED(void CRYPTO_set_id_callback(unsigned long (*func)(void))); +/* + * mkdef.pl cannot handle this next one so not inside DECLARE_DEPRECATED, + * but still inside OPENSSL_USE_DEPRECATED + */ unsigned long (*CRYPTO_get_id_callback(void))(void); -unsigned long CRYPTO_thread_id(void); +DECLARE_DEPRECATED(unsigned long CRYPTO_thread_id(void)); #endif const char *CRYPTO_get_lock_name(int type); |