dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

--- a/src/ssl.cpp
+++ b/src/ssl.cpp
@@ -99,35 +99,7 @@
     return 0;
 }
 
-extern "C" {
-    static int _wrap_mutex_init(void **priv)
-    {
-        return _gcry_mutex_init((Mutex **)(priv));
-    }
-
-    static int _wrap_mutex_destroy(void **priv)
-    {
-        return _gcry_mutex_destroy((Mutex **)(priv));
-    }
-
-    static int _wrap_mutex_lock(void **priv)
-    {
-        return _gcry_mutex_lock((Mutex **)(priv));
-    }
-
-    static int _wrap_mutex_unlock(void **priv)
-    {
-        return _gcry_mutex_unlock((Mutex **)(priv));
-    }
-
-    static struct gcry_thread_cbs _gcry_threads =
-    {
-        GCRY_THREAD_OPTION_PTHREAD, NULL,
-        _wrap_mutex_init, _wrap_mutex_destroy,
-        _wrap_mutex_lock, _wrap_mutex_unlock
-    };
-
-};
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 #endif
 
@@ -135,7 +107,7 @@
 public:
     _ssl_global() {
 #ifndef WIN32
-        gcry_control(GCRYCTL_SET_THREAD_CBS, &_gcry_threads);
+        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 #endif
         gnutls_global_init();
     }