aboutsummaryrefslogtreecommitdiff
path: root/src/gnutls/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gnutls/init.c')
-rw-r--r--src/gnutls/init.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gnutls/init.c b/src/gnutls/init.c
index 638f629c..4c47d162 100644
--- a/src/gnutls/init.c
+++ b/src/gnutls/init.c
@@ -26,7 +26,7 @@
26#include "init.h" 26#include "init.h"
27 27
28 28
29#ifdef MHD_HTTPS_REQUIRE_GRYPT 29#ifdef MHD_HTTPS_REQUIRE_GCRYPT
30#if defined(HTTPS_SUPPORT) && GCRYPT_VERSION_NUMBER < 0x010600 30#if defined(HTTPS_SUPPORT) && GCRYPT_VERSION_NUMBER < 0x010600
31#if defined(MHD_USE_POSIX_THREADS) 31#if defined(MHD_USE_POSIX_THREADS)
32GCRY_THREAD_OPTION_PTHREAD_IMPL; 32GCRY_THREAD_OPTION_PTHREAD_IMPL;
@@ -40,7 +40,7 @@ gcry_w32_mutex_init (void **ppmtx)
40 40
41 if (NULL == *ppmtx) 41 if (NULL == *ppmtx)
42 return ENOMEM; 42 return ENOMEM;
43 if (! MHD_mutex_init_ ((MHD_mutex_*) *ppmtx)) 43 if (! MHD_mutex_init_ ((MHD_mutex_ *) *ppmtx))
44 { 44 {
45 free (*ppmtx); 45 free (*ppmtx);
46 *ppmtx = NULL; 46 *ppmtx = NULL;
@@ -53,7 +53,7 @@ gcry_w32_mutex_init (void **ppmtx)
53static int 53static int
54gcry_w32_mutex_destroy (void **ppmtx) 54gcry_w32_mutex_destroy (void **ppmtx)
55{ 55{
56 int res = (MHD_mutex_destroy_ ((MHD_mutex_*) *ppmtx)) ? 0 : EINVAL; 56 int res = (MHD_mutex_destroy_ ((MHD_mutex_ *) *ppmtx)) ? 0 : EINVAL;
57 free (*ppmtx); 57 free (*ppmtx);
58 return res; 58 return res;
59} 59}
@@ -62,14 +62,14 @@ gcry_w32_mutex_destroy (void **ppmtx)
62static int 62static int
63gcry_w32_mutex_lock (void **ppmtx) 63gcry_w32_mutex_lock (void **ppmtx)
64{ 64{
65 return MHD_mutex_lock_ ((MHD_mutex_*) *ppmtx) ? 0 : EINVAL; 65 return MHD_mutex_lock_ ((MHD_mutex_ *) *ppmtx) ? 0 : EINVAL;
66} 66}
67 67
68 68
69static int 69static int
70gcry_w32_mutex_unlock (void **ppmtx) 70gcry_w32_mutex_unlock (void **ppmtx)
71{ 71{
72 return MHD_mutex_unlock_ ((MHD_mutex_*) *ppmtx) ? 0 : EINVAL; 72 return MHD_mutex_unlock_ ((MHD_mutex_ *) *ppmtx) ? 0 : EINVAL;
73} 73}
74 74
75 75
@@ -82,7 +82,7 @@ static struct gcry_thread_cbs gcry_threads_w32 = {
82 82
83#endif /* defined(MHD_W32_MUTEX_) */ 83#endif /* defined(MHD_W32_MUTEX_) */
84#endif /* HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 */ 84#endif /* HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 */
85#endif /* MHD_HTTPS_REQUIRE_GRYPT */ 85#endif /* MHD_HTTPS_REQUIRE_GCRYPT */
86 86
87 87
88#ifndef _AUTOINIT_FUNCS_ARE_SUPPORTED 88#ifndef _AUTOINIT_FUNCS_ARE_SUPPORTED
@@ -129,7 +129,7 @@ MHD_TLS_init (void)
129 WSADATA wsd; 129 WSADATA wsd;
130#endif /* _WIN32 && ! __CYGWIN__ */ 130#endif /* _WIN32 && ! __CYGWIN__ */
131 131
132#ifdef MHD_HTTPS_REQUIRE_GRYPT 132#ifdef MHD_HTTPS_REQUIRE_GCRYPT
133#if GCRYPT_VERSION_NUMBER < 0x010600 133#if GCRYPT_VERSION_NUMBER < 0x010600
134#if defined(MHD_USE_POSIX_THREADS) 134#if defined(MHD_USE_POSIX_THREADS)
135 if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, 135 if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS,
@@ -146,7 +146,7 @@ MHD_TLS_init (void)
146 MHD_PANIC (_ ( 146 MHD_PANIC (_ (
147 "libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer.\n")); 147 "libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer.\n"));
148#endif 148#endif
149#endif /* MHD_HTTPS_REQUIRE_GRYPT */ 149#endif /* MHD_HTTPS_REQUIRE_GCRYPT */
150 gnutls_global_init (); 150 gnutls_global_init ();
151} 151}
152 152