X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Ferr%2Ferr.h;h=0ef83d5ead95390b397eb3a4319d82684804e82f;hb=f3c751067a696e0774a56800caa5a8793f0a608d;hp=4860d45f1db8c652f6cc6c808bc01fedb989e69a;hpb=c74b3a6037b329dbd9dfbaf1a103e2cc707ecdbc;p=oweals%2Fopenssl.git

diff --git a/crypto/err/err.h b/crypto/err/err.h
index 4860d45f1d..0ef83d5ead 100644
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -214,7 +214,6 @@ typedef struct ERR_string_data_st
 	const char *string;
 	} ERR_STRING_DATA;
 
-#ifndef NOPROTO
 void ERR_put_error(int lib, int func,int reason,const char *file,int line);
 void ERR_set_error_data(char *data,int flags);
 
@@ -236,7 +235,7 @@ void ERR_print_errors_fp(FILE *fp);
 #endif
 #ifdef HEADER_BIO_H
 void ERR_print_errors(BIO *bp);
-void ERR_add_error_data( VAR_PLIST( int, num ) );
+void ERR_add_error_data(int num, ...);
 #endif
 void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
 void ERR_load_ERR_strings(void );
@@ -256,47 +255,6 @@ char *ERR_get_err_state_table(void );
 
 int ERR_get_next_error_library(void );
 
-#else
-
-void ERR_put_error();
-void ERR_set_error_data();
-
-unsigned long ERR_get_error();
-unsigned long ERR_get_error_line();
-unsigned long ERR_get_error_line_data();
-unsigned long ERR_peek_error();
-unsigned long ERR_peek_error_line();
-unsigned long ERR_peek_error_line_data();
-void ERR_clear_error();
-char *ERR_error_string();
-char *ERR_lib_error_string();
-char *ERR_func_error_string();
-char *ERR_reason_error_string();
-#ifndef NO_FP_API
-void ERR_print_errors_fp();
-#endif
-void ERR_print_errors();
-void ERR_add_error_data();
-void ERR_load_strings();
-void ERR_load_ERR_strings();
-void ERR_load_crypto_strings();
-void ERR_free_strings();
-
-void ERR_remove_state();
-ERR_STATE *ERR_get_state();
-
-#ifdef HEADER_LHASH_H
-LHASH *ERR_get_string_table();
-LHASH *ERR_get_err_state_table();
-#else
-char *ERR_get_string_table();
-char *ERR_get_err_state_table();
-#endif
-
-int ERR_get_next_error_library();
-
-#endif
-
 #ifdef	__cplusplus
 }
 #endif