X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Finit_globals.c;h=6bd03fb0db02c6a9d99224454f4ec356268e1771;hp=79845f43c499419f9479d77af68659d5cd82f8dd;hb=ae102dcb4c5a0429f4ebdbb6ecb60b1cc437f8e4;hpb=7b35dc1bb4add8c5db287eecdf57bb872751eea3

diff --git a/src/init_globals.c b/src/init_globals.c
index 79845f4..6bd03fb 100644
--- a/src/init_globals.c
+++ b/src/init_globals.c
@@ -50,6 +50,10 @@ void yaz_init_globals(void)
     if (!yaz_init_flag)
     {
         yaz_log_init_globals();
+#if HAVE_GCRYPT_H
+        /* POSIX threads locking. In case gnutls_global_init do not override */
+        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif
 #if HAVE_GNUTLS_H
         gnutls_global_init();
 #endif
@@ -57,7 +61,6 @@ void yaz_init_globals(void)
         /* most likely, GnuTLS has already initialized libgcrypt */
         if (gcry_control(GCRYCTL_ANY_INITIALIZATION_P) == 0)
         {
-            gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
             gcry_control(GCRYCTL_INITIALIZATION_FINISHED, NULL, 0);
         }
 #endif