diff options
| author | 2010-06-30 22:18:48 +0200 | |
|---|---|---|
| committer | 2010-06-30 22:18:48 +0200 | |
| commit | 3928f79a358f10de421ad015ce11679291ccf4c6 (patch) | |
| tree | ed06798d1f4a9dac3fdf8c0d52bd87416820427e /src | |
| parent | f10ab4fd830c473b789e9833566d0d88825b6a39 (diff) | |
More libgcrypt fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gnutls_hooks.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c index 8bb0059..2130cb0 100644 --- a/src/gnutls_hooks.c +++ b/src/gnutls_hooks.c | |||
| @@ -20,18 +20,17 @@ | |||
| 20 | #include "http_vhost.h" | 20 | #include "http_vhost.h" |
| 21 | #include "ap_mpm.h" | 21 | #include "ap_mpm.h" |
| 22 | 22 | ||
| 23 | #if GNUTLS_VERSION_MAJOR <= 2 && GNUTLS_VERSION_MINOR < 11 | 23 | #if APR_HAS_THREADS |
| 24 | # if GNUTLS_VERSION_MAJOR <= 2 && GNUTLS_VERSION_MINOR < 11 | ||
| 24 | #include <gcrypt.h> | 25 | #include <gcrypt.h> |
| 26 | GCRY_THREAD_OPTION_PTHREAD_IMPL; | ||
| 27 | # endif | ||
| 25 | #endif | 28 | #endif |
| 26 | 29 | ||
| 27 | #if !USING_2_1_RECENT | 30 | #if !USING_2_1_RECENT |
| 28 | extern server_rec *ap_server_conf; | 31 | extern server_rec *ap_server_conf; |
| 29 | #endif | 32 | #endif |
| 30 | 33 | ||
| 31 | #if APR_HAS_THREADS | ||
| 32 | GCRY_THREAD_OPTION_PTHREAD_IMPL; | ||
| 33 | #endif | ||
| 34 | |||
| 35 | #if MOD_GNUTLS_DEBUG | 34 | #if MOD_GNUTLS_DEBUG |
| 36 | static apr_file_t *debug_log_fp; | 35 | static apr_file_t *debug_log_fp; |
| 37 | #endif | 36 | #endif |
