From 8c55294ea9134c32f80d1a399a6a49ecdc9264b2 Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Wed, 1 Sep 2010 14:07:45 +0200
Subject: Openssl implementation of threading + default imp

---
 include/libssh/callbacks.h | 15 +++++++++++++++
 include/libssh/threads.h   | 13 +++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'include/libssh')

diff --git a/include/libssh/callbacks.h b/include/libssh/callbacks.h
index 589c0ae..e66fb64 100644
--- a/include/libssh/callbacks.h
+++ b/include/libssh/callbacks.h
@@ -248,6 +248,21 @@ typedef struct ssh_packet_callbacks_struct *ssh_packet_callbacks;
  */
 LIBSSH_API int ssh_set_callbacks(ssh_session session, ssh_callbacks cb);
 
+/** @} */
+
+typedef int (*ssh_thread_callback) (void **lock);
+typedef unsigned long (*ssh_thread_id_callback) (void);
+struct ssh_threads_callbacks_struct {
+  ssh_thread_callback mutex_init;
+  ssh_thread_callback mutex_destroy;
+  ssh_thread_callback mutex_lock;
+  ssh_thread_callback mutex_unlock;
+  ssh_thread_id_callback thread_id;
+};
+
+LIBSSH_API int ssh_init_set_threads_callbacks(struct ssh_threads_callbacks_struct
+    *cb);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/libssh/threads.h b/include/libssh/threads.h
index 6f82ee3..d83e421 100644
--- a/include/libssh/threads.h
+++ b/include/libssh/threads.h
@@ -22,17 +22,10 @@
 #ifndef THREADS_H_
 #define THREADS_H_
 
-typedef int (*ssh_thread_callback) (void **lock);
-struct ssh_threads_callbacks_struct {
-  ssh_thread_callback mutex_init;
-  ssh_thread_callback mutex_destroy;
-  ssh_thread_callback mutex_lock;
-  ssh_thread_callback mutex_unlock;
-};
+#include <libssh/callbacks.h>
 
 int ssh_threads_init(void);
-int ssh_init_set_threads_callbacks(struct ssh_threads_callbacks_struct
-    *cb);
-int ssh_init_set_threads_pthreads(void);
+void ssh_threads_finalize(void);
+
 
 #endif /* THREADS_H_ */
-- 
cgit