Support verify_depth from the SSL API without need for user-defined

[openssl.git] / crypto / cryptlib.c

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 3285813a13d743dff5091aad1525e93623a9a98a..2a008729fb0c6fb0482824609cb9ee0be1e5342c 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "cryptlib.h"
-#include "crypto.h"
+#include <openssl/crypto.h>
 #include "date.h"
 
 #if defined(WIN32) || defined(WIN16)
@@ -94,18 +94,11 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
 
 static STACK *app_locks=NULL;
 
-#ifndef NOPROTO
 static void (MS_FAR *locking_callback)(int mode,int type,
        const char *file,int line)=NULL;
 static int (MS_FAR *add_lock_callback)(int *pointer,int amount,
        int type,const char *file,int line)=NULL;
 static unsigned long (MS_FAR *id_callback)(void)=NULL;
-#else
-static void (MS_FAR *locking_callback)()=NULL;
-static int (MS_FAR *add_lock_callback)()=NULL;
-static unsigned long (MS_FAR *id_callback)()=NULL;
-#endif
-
 int CRYPTO_get_new_lockid(char *name)
        {
        char *str;
@@ -158,12 +151,12 @@ void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type,
        add_lock_callback=func;
        }
 
-unsigned long (*CRYPTO_get_id_callback(P_V))(P_V)
+unsigned long (*CRYPTO_get_id_callback(void))(void)
        {
        return(id_callback);
        }
 
-void CRYPTO_set_id_callback(func) unsigned long (*func)(P_V);
+void CRYPTO_set_id_callback(unsigned long (*func)(void))
        {
        id_callback=func;
        }