diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 15:03:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 15:03:53 +0200 |
| commit | e7701775553a60efb050b0df497bb4df5df46d62 (patch) | |
| tree | 5e8183f6bbb33e106624e8c9d9c3eab7a7006de9 /runtime/nsd_gtls.c | |
| parent | 359ddad3c5dce82ab48964c1d8b804c4155ea39c (diff) | |
| parent | 12102199c4b3a042fb91e1d52eb274f06e62213e (diff) | |
| download | rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.tar.gz rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.tar.bz2 rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/nsd_gtls.c')
| -rw-r--r-- | runtime/nsd_gtls.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index cc8f78d1..17ac426b 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -29,7 +29,9 @@ #include <string.h> #include <gnutls/gnutls.h> #include <gnutls/x509.h> -#include <gcrypt.h> +#if GNUTLS_VERSION_NUMBER <= 0x020b00 +# include <gcrypt.h> +#endif #include <errno.h> #include <sys/stat.h> #include <unistd.h> @@ -561,7 +563,9 @@ gtlsGlblInit(void) DEFiRet; /* gcry_control must be called first, so that the thread system is correctly set up */ + #if GNUTLS_VERSION_NUMBER <= 0x020b00 gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); + #endif CHKgnutls(gnutls_global_init()); /* X509 stuff */ |