Fixed support for old libgcrypt on W32 with W32 threads.

2 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 77984c9e..3b07dc14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 22 20:39:00 MSK 2017
+        Fixed builds in Linux without epoll.
+        Check for invalid --with-thread= configure parameters.
+        Fixed support for old libgcrypt on W32 with W32 threads. -EG
+
 Tue Apr 11 22:17:00 MSK 2017
         Releasing GNU libmicrohttpd 0.9.53. -EG
 
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 02713e3a..fb8922f4 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6664,7 +6664,7 @@ gcry_w32_mutex_init (void **ppmtx)
 static int
 gcry_w32_mutex_destroy (void **ppmtx)
 {
-  int res = (MHD_mutex_destroy_chk_ ((MHD_mutex_*)*ppmtx)) ? 0 : 1;
+  int res = (MHD_mutex_destroy_ ((MHD_mutex_*)*ppmtx)) ? 0 : EINVAL;
   free (*ppmtx);
   return res;
 }
@@ -6673,16 +6673,14 @@ gcry_w32_mutex_destroy (void **ppmtx)
 static int
 gcry_w32_mutex_lock (void **ppmtx)
 {
-  MHD_mutex_lock_chk_ ((MHD_mutex_*)*ppmtx);
-  return 0;
+  return MHD_mutex_lock_ ((MHD_mutex_*)*ppmtx) ? 0 : EINVAL;
 }
 
 
 static int
 gcry_w32_mutex_unlock (void **ppmtx)
 {
-  MHD_mutex_unlock_chk_ ((MHD_mutex_*)*ppmtx);
-  return 0;
+  return MHD_mutex_unlock_ ((MHD_mutex_*)*ppmtx) ? 0 : EINVAL;
 }