diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-05-08 17:01:09 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-05-10 11:31:05 +0200 |
| commit | 21e001747d4a246827ad432fc508d67ac404ecdb (patch) | |
| tree | 512105b818918f601165eb8105c725f46d1f3ba4 /include | |
| parent | 06aa885d0ccbb018ff7044258e9a8b6e7a56681d (diff) | |
Restore the ERR_remove_thread_state() API and make it a no-op
The ERR_remove_thread_state() API is restored to take a pointer
argument, but does nothing more. ERR_remove_state() is also made into
a no-op. Both functions are deprecated and users are recommended to
use OPENSSL_thread_stop() instead.
Documentation is changed to reflect this.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/err.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/openssl/err.h b/include/openssl/err.h index ccf2ff72de..e41fdc3efe 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -359,9 +359,8 @@ void ERR_load_ERR_strings(void); # define ERR_free_strings() while(0) continue #endif -void ERR_remove_thread_state(void); -DEPRECATEDIN_1_0_0(void ERR_remove_state(unsigned long pid)) /* if zero we - * look it up */ +DEPRECATEDIN_1_1_0(void ERR_remove_thread_state(void *)) +DEPRECATEDIN_1_0_0(void ERR_remove_state(unsigned long pid)) ERR_STATE *ERR_get_state(void); LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void); |