The branch master has been updated
via e1c0348cc728cb37003ae411879bd23b6a84fcc8 (commit)
from 9d978ac3f304286be13fde228632c2739e00834c (commit)
- Log -----------------------------------------------------------------
commit e1c0348cc728cb37003ae411879bd23b6a84fcc8
Author: Dr. Matthias St. Pierre <matthias.st.pie...@ncp-e.com>
Date: Thu Apr 19 23:33:32 2018 +0200
openssl/err.h: remove duplicate OSSL_STOREerr()
Two definitions in lines 127 and 136, introduced in 71a5516dcc8.
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6029)
-----------------------------------------------------------------------
Summary of changes:
include/openssl/err.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/openssl/err.h b/include/openssl/err.h
index 524c542..6cae1a3 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) | \
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
