1 files changed, 24 insertions, 55 deletions

diff --git a/src/lib/libcrypto/threads/th-lock.c b/src/lib/libcrypto/threads/th-lock.c
index 039022446d..afb4f4caf2 100644
--- a/src/lib/libcrypto/threads/th-lock.c
+++ b/src/lib/libcrypto/threads/th-lock.c
@@ -74,15 +74,14 @@
 #include <ulocks.h>
 #include <sys/prctl.h>
 #endif
-#include "lhash.h"
-#include "crypto.h"
-#include "buffer.h"
-#include "e_os.h"
-#include "x509.h"
-#include "ssl.h"
-#include "err.h"
-
-#ifndef NOPROTO
+#include <openssl/lhash.h>
+#include <openssl/crypto.h>
+#include <openssl/buffer.h>
+#include <openssl/e_os.h>
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
 int CRYPTO_thread_setup(void);
 void CRYPTO_thread_cleanup(void);
 
@@ -95,21 +94,6 @@ static unsigned long irix_thread_id(void );
 static unsigned long solaris_thread_id(void );
 static unsigned long pthreads_thread_id(void );
 
-#else
-int CRYPOTO_thread_setup();
-void CRYPTO_cleanup();
-
-static void irix_locking_callback();
-static void solaris_locking_callback();
-static void win32_locking_callback();
-static void pthreads_locking_callback();
-
-static unsigned long irix_thread_id();
-static unsigned long solaris_thread_id();
-static unsigned long pthreads_thread_id();
-
-#endif
-
 /* usage:
  * CRYPTO_thread_setup();
  * applicaion code
@@ -122,7 +106,7 @@ static unsigned long pthreads_thread_id();
 
 static HANDLE lock_cs[CRYPTO_NUM_LOCKS];
 
-int CRYPTO_thread_setup()
+int CRYPTO_thread_setup(void)
         {
         int i;
 
@@ -136,7 +120,7 @@ int CRYPTO_thread_setup()
         return(1);
         }
 
-static void CRYPTO_thread_cleanup()
+static void CRYPTO_thread_cleanup(void)
         {
         int i;
 
@@ -145,11 +129,7 @@ static void CRYPTO_thread_cleanup()
                 CloseHandle(lock_cs[i]);
         }
 
-void win32_locking_callback(mode,type,file,line)
-int mode;
-int type;
-char *file;
-int line;
+void win32_locking_callback(int mode, int type, char *file, int line)
         {
         if (mode & CRYPTO_LOCK)
                 {
@@ -174,7 +154,7 @@ static long lock_count[CRYPTO_NUM_LOCKS];
 static rwlock_t lock_cs[CRYPTO_NUM_LOCKS];
 #endif
 
-void CRYPTO_thread_setup()
+void CRYPTO_thread_setup(void)
         {
         int i;
 
@@ -192,7 +172,7 @@ void CRYPTO_thread_setup()
         CRYPTO_set_locking_callback((void (*)())solaris_locking_callback);
         }
 
-void CRYPTO_thread_cleanup()
+void CRYPTO_thread_cleanup(void)
         {
         int i;
 
@@ -207,11 +187,7 @@ void CRYPTO_thread_cleanup()
                 }
         }
 
-void solaris_locking_callback(mode,type,file,line)
-int mode;
-int type;
-char *file;
-int line;
+void solaris_locking_callback(int mode, int type, char *file, int line)
         {
 #if 0
         fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n",
@@ -248,7 +224,7 @@ int line;
                 }
         }
 
-unsigned long solaris_thread_id()
+unsigned long solaris_thread_id(void)
         {
         unsigned long ret;
 
@@ -263,7 +239,7 @@ unsigned long solaris_thread_id()
 static usptr_t *arena;
 static usema_t *lock_cs[CRYPTO_NUM_LOCKS];
 
-void CRYPTO_thread_setup()
+void CRYPTO_thread_setup(void)
         {
         int i;
         char filename[20];
@@ -287,7 +263,7 @@ void CRYPTO_thread_setup()
         CRYPTO_set_locking_callback((void (*)())irix_locking_callback);
         }
 
-void CRYPTO_thread_cleanup()
+void CRYPTO_thread_cleanup(void)
         {
         int i;
 
@@ -302,11 +278,7 @@ void CRYPTO_thread_cleanup()
                 }
         }
 
-void irix_locking_callback(mode,type,file,line)
-int mode;
-int type;
-char *file;
-int line;
+void irix_locking_callback(int mode, int type, char *file, int line)
         {
         if (mode & CRYPTO_LOCK)
                 {
@@ -318,7 +290,7 @@ int line;
                 }
         }
 
-unsigned long irix_thread_id()
+unsigned long irix_thread_id(void)
         {
         unsigned long ret;
 
@@ -333,7 +305,7 @@ unsigned long irix_thread_id()
 static pthread_mutex_t lock_cs[CRYPTO_NUM_LOCKS];
 static long lock_count[CRYPTO_NUM_LOCKS];
 
-void CRYPTO_thread_setup()
+void CRYPTO_thread_setup(void)
         {
         int i;
 
@@ -347,7 +319,7 @@ void CRYPTO_thread_setup()
         CRYPTO_set_locking_callback((void (*)())pthreads_locking_callback);
         }
 
-void thread_cleanup()
+void thread_cleanup(void)
         {
         int i;
 
@@ -358,11 +330,8 @@ void thread_cleanup()
                 }
         }
 
-void pthreads_locking_callback(mode,type,file,line)
-int mode;
-int type;
-char *file;
-int line;
+void pthreads_locking_callback(int mode, int type, char *file,
+             int line)
       {
 #if 0
         fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n",
@@ -387,7 +356,7 @@ int line;
                 }
         }
 
-unsigned long pthreads_thread_id()
+unsigned long pthreads_thread_id(void)
         {
         unsigned long ret;