aboutsummaryrefslogtreecommitdiff
path: root/include/openssl/crypto.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-01-23 09:46:13 -0500
committerRichard Levitte <levitte@openssl.org>2018-02-09 17:49:07 +0100
commita5d0d6b8fd1645c150e1b276863157bb29f0f598 (patch)
treecd65a49d96b7788b2537616f8a59cf562494d467 /include/openssl/crypto.h
parent5d671101739f9e9b259126375a9e8b2fa42ac45f (diff)
downloadopenssl-a5d0d6b8fd1645c150e1b276863157bb29f0f598.zip
openssl-a5d0d6b8fd1645c150e1b276863157bb29f0f598.tar.gz
openssl-a5d0d6b8fd1645c150e1b276863157bb29f0f598.tar.bz2
Remove redundant declarations of ERR_load_*_strings()
In commit 52df25cf2e656146cb3b206d8220124f0417d03f, the ERR_load_FOO_strings() functions were moved from their original location in foo.h into new headers called fooerr.h. But they were never removed from their original locations. This duplication causes redundant-declaration warnings on programs that use OpenSSL's headers with such warnings enabled. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5150)
Diffstat (limited to 'include/openssl/crypto.h')
-rw-r--r--include/openssl/crypto.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 478f9e2..4daf0c7 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -439,7 +439,6 @@ int CRYPTO_THREAD_cleanup_local(CRYPTO_THREAD_LOCAL *key);
CRYPTO_THREAD_ID CRYPTO_THREAD_get_current_id(void);
int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b);
-int ERR_load_CRYPTO_strings(void);
# ifdef __cplusplus
}