Commit a5d0d6b8 authored by Nick Mathewson's avatar Nick Mathewson Committed by Richard Levitte
Browse files

Remove redundant declarations of ERR_load_*_strings() 



In commit 52df25cf, 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: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5150)
parent 5d671101

include/openssl/async.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ ASYNC_WAIT_CTX *ASYNC_get_wait_ctx(ASYNC_JOB *job); 
void ASYNC_block_pause(void);

void ASYNC_unblock_pause(void);



int ERR_load_ASYNC_strings(void);



# ifdef  __cplusplus

}

include/openssl/bio.h

+0 −1
Original line number Diff line number Diff line
@@ -790,7 +790,6 @@ long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) 
int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,

                               long (*callback_ctrl) (BIO *, int,

                                                      BIO_info_cb *));

int ERR_load_BIO_strings(void);



# ifdef  __cplusplus

}

include/openssl/bn.h

+0 −1
Original line number Diff line number Diff line
@@ -481,7 +481,6 @@ BIGNUM *BN_get_rfc3526_prime_8192(BIGNUM *bn); 


int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom);



int ERR_load_BN_strings(void);



# ifdef  __cplusplus

}

include/openssl/buffer.h

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ size_t BUF_MEM_grow(BUF_MEM *str, size_t len); 
size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len);

void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);



int ERR_load_BUF_strings(void);



# ifdef  __cplusplus

}

include/openssl/cms.h

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg, 
# define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE \

    CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE



int ERR_load_CMS_strings(void);

#  ifdef  __cplusplus

}

#  endif