Fixed Windows compilation failure

[oweals/openssl.git] / crypto / err / err.h

diff --git a/crypto/err/err.h b/crypto/err/err.h
index 99340c82947a8412104ee4a0326b571e199f219f..974cc9cc6f903129936edccff2d8ea78cdf5638b 100644 (file)
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -147,9 +147,6 @@ extern "C" {
 #define ERR_NUM_ERRORS 16
 typedef struct err_state_st
        {
-#ifndef OPENSSL_NO_DEPRECATED
-       unsigned long pid;
-#endif
        CRYPTO_THREADID tid;
        int err_flags[ERR_NUM_ERRORS];
        unsigned long err_buffer[ERR_NUM_ERRORS];
@@ -200,6 +197,7 @@ typedef struct err_state_st
 #define ERR_LIB_CMS            46
 #define ERR_LIB_TS             47
 #define ERR_LIB_HMAC           48
+#define ERR_LIB_JPAKE          49
 
 #define ERR_LIB_USER           128
 
@@ -235,6 +233,7 @@ typedef struct err_state_st
 #define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
 #define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)
 #define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
+#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)
 
 /* Borland C seems too stupid to be able to shift and do longs in
  * the pre-processor :-( */
@@ -345,15 +344,16 @@ void ERR_print_errors_fp(FILE *fp);
 #endif
 #ifndef OPENSSL_NO_BIO
 void ERR_print_errors(BIO *bp);
-void ERR_add_error_data(int num, ...);
 #endif
+void ERR_add_error_data(int num, ...);
+void ERR_add_error_vdata(int num, va_list args);
 void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
 void ERR_unload_strings(int lib,ERR_STRING_DATA str[]);
 void ERR_load_ERR_strings(void);
 void ERR_load_crypto_strings(void);
 void ERR_free_strings(void);
 
-void ERR_remove_thread_state(CRYPTO_THREADID *tid);
+void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
 #ifndef OPENSSL_NO_DEPRECATED
 void ERR_remove_state(unsigned long pid); /* if zero we look it up */
 #endif