projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No [rest of output is omitted] limit for yaz_log YAZ-774
[yaz-moved-to-github.git]
/
src
/
init_globals.c
diff --git
a/src/init_globals.c
b/src/init_globals.c
index
79845f4
..
6bd03fb
100644
(file)
--- 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 (!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
#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)
{
/* 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
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, NULL, 0);
}
#endif