Remove NOPROTO definitions and error code comments.

[openssl.git] / crypto / crypto.h

diff --git a/crypto/crypto.h b/crypto/crypto.h
index 44d65f5f1b959c0fc9546d8aca8aaf5088a29af3..007a4a2f777866bb8bed9a05d85a125af86b1c65 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -63,8 +63,12 @@
 extern "C" {
 #endif
 
-#include "stack.h"
-#include "opensslv.h"
+#ifndef NO_FP_API
+#include <stdio.h>
+#endif
+
+#include <openssl/stack.h>
+#include <openssl/opensslv.h>
 
 /* Backward compatibility to SSLeay */
 /* This is more to be used to check the correct DLL is being used
@@ -231,7 +235,6 @@ typedef struct crypto_ex_data_func_st
 #define ERR_load_CRYPTO_strings        ERR_load_CRYPTOlib_strings
 #endif
 
-#ifndef NOPROTO
 
 const char *SSLeay_version(int type);
 unsigned long SSLeay(void);
@@ -287,52 +290,11 @@ void CRYPTO_mem_leaks_cb(void (*cb)());
 
 void ERR_load_CRYPTO_strings(void );
 
-#else 
-
-int CRYPTO_get_ex_new_index();
-int CRYPTO_set_ex_data();
-char *CRYPTO_get_ex_data();
-int CRYPTO_dup_ex_data();
-void CRYPTO_free_ex_data();
-void CRYPTO_new_ex_data();
-
-int CRYPTO_mem_ctrl();
-char *SSLeay_version();
-unsigned long SSLeay();
-
-int CRYPTO_get_new_lockid();
-void CRYPTO_lock();
-void CRYPTO_set_locking_callback();
-void (*CRYPTO_get_locking_callback())();
-void CRYPTO_set_add_lock_callback();
-int (*CRYPTO_get_add_lock_callback())();
-void CRYPTO_set_id_callback();
-unsigned long (*CRYPTO_get_id_callback())();
-unsigned long CRYPTO_thread_id();
-const char *CRYPTO_get_lock_name();
-int CRYPTO_add_lock();
-
-void CRYPTO_set_mem_functions();
-void CRYPTO_get_mem_functions();
-void *CRYPTO_malloc();
-void *CRYPTO_realloc();
-void CRYPTO_free();
-void *CRYPTO_remalloc();
-void *CRYPTO_dbg_remalloc();
-void *CRYPTO_dbg_malloc();
-void *CRYPTO_dbg_realloc();
-void CRYPTO_dbg_free();
-#ifndef NO_FP_API
-void CRYPTO_mem_leaks_fp();
-#endif
-void CRYPTO_mem_leaks();
-void CRYPTO_mem_leaks_cb();
-
-void ERR_load_CRYPTO_strings();
-
-#endif
-
 /* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
 /* Error codes for the CRYPTO functions. */
 
 /* Function codes. */
@@ -341,7 +303,7 @@ void ERR_load_CRYPTO_strings();
 #define CRYPTO_F_CRYPTO_SET_EX_DATA                     102
 
 /* Reason codes. */
- 
+
 #ifdef  __cplusplus
 }
 #endif