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 /tests | |
| parent | 359ddad3c5dce82ab48964c1d8b804c4155ea39c (diff) | |
| parent | 12102199c4b3a042fb91e1d52eb274f06e62213e (diff) | |
| download | rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.tar.gz rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.tar.xz rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tcpflood.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/tcpflood.c b/tests/tcpflood.c index 8485acbb..8a34f06f 100644 --- a/tests/tcpflood.c +++ b/tests/tcpflood.c @@ -91,8 +91,10 @@ #include <errno.h> #ifdef ENABLE_GNUTLS # include <gnutls/gnutls.h> -# include <gcrypt.h> +# if GNUTLS_VERSION_NUMBER <= 0x020b00 +# include <gcrypt.h> GCRY_THREAD_OPTION_PTHREAD_IMPL; +# endif #endif #define EXIT_FAILURE 1 @@ -707,7 +709,9 @@ initTLS(void) int r; /* order of gcry_control and gnutls_global_init matters! */ + #if GNUTLS_VERSION_NUMBER <= 0x020b00 gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); + #endif gnutls_global_init(); /* set debug mode, if so required by the options */ if(tlsLogLevel > 0) { |