From: Dr. Matthias St. Pierre Date: Thu, 19 Apr 2018 21:33:32 +0000 (+0200) Subject: openssl/err.h: remove duplicate OSSL_STOREerr() X-Git-Tag: OpenSSL_1_1_1-pre6~67 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e1c0348cc728cb37003ae411879bd23b6a84fcc8;p=oweals%2Fopenssl.git openssl/err.h: remove duplicate OSSL_STOREerr() Two definitions in lines 127 and 136, introduced in 71a5516dcc8. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/6029) --- diff --git a/include/openssl/err.h b/include/openssl/err.h index 524c5425bf..6cae1a3651 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -133,7 +133,6 @@ typedef struct err_state_st { # define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define KDFerr(f,r) ERR_PUT_error(ERR_LIB_KDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define SM2err(f,r) ERR_PUT_error(ERR_LIB_SM2,(f),(r),OPENSSL_FILE,OPENSSL_LINE) -# define OSSL_STOREerr(f,r) ERR_PUT_error(ERR_LIB_OSSL_STORE,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define ERR_PACK(l,f,r) ( \ (((unsigned int)(l) & 0x0FF) << 24L) | \