From 48b38bdbbea2ce2b7ea6aabfbbf95c54ad8cb014 Mon Sep 17 00:00:00 2001
From: "Evgeny Grin (Karlson2k)" <k2k@narod.ru>
Date: Thu, 6 Oct 2016 18:09:34 +0000
Subject: [PATCH] Fixed VS builds.

---
 w32/common/MHD_config.h    | 10 ----------
 w32/common/gen_dll_res.ps1 |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/w32/common/MHD_config.h b/w32/common/MHD_config.h
index 90638093..72b157ac 100644
--- a/w32/common/MHD_config.h
+++ b/w32/common/MHD_config.h
@@ -60,19 +60,12 @@
 #define HAVE_POLL 1
 #endif /* _WIN32_WINNT >= 0x0600 */
 
-/* define to 0 to disable epoll support */
-#define EPOLL_SUPPORT 0
-
 /* Define to 1 if you have the <winsock2.h> header file. */
 #define HAVE_WINSOCK2_H 1
 
 /* Define to 1 if you have the <ws2tcpip.h> header file. */
 #define HAVE_WS2TCPIP_H 1
 
-/* Define to 1 if you have the declaration of `SOCK_NONBLOCK', and to 0 if you
-   don't. */
-#define HAVE_DECL_SOCK_NONBLOCK 0
-
 /* Define to 1 if you have the `_lseeki64' function. */
 #define HAVE___LSEEKI64 1
 
@@ -114,9 +107,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
-/* Define to 1 if you have the <pthread.h> header file. */
-#define HAVE_PTHREAD_H 0
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
diff --git a/w32/common/gen_dll_res.ps1 b/w32/common/gen_dll_res.ps1
index e51d1034..92560ee0 100644
--- a/w32/common/gen_dll_res.ps1
+++ b/w32/common/gen_dll_res.ps1
@@ -8,7 +8,7 @@ Remove-Variable MHD_ver,MHD_ver_major,MHD_ver_minor,MHD_ver_patchlev -ErrorActio
 Write-Output "Processing: ${BasePath}..\..\configure.ac"
 foreach($line in Get-Content "${BasePath}..\..\configure.ac")
 {
-    if ($line -match '^AC_INIT\(\[libmicrohttpd\],\[((\d+).(\d+).(\d+))\]') 
+    if ($line -match '^AC_INIT\(\[(?:GNU )?libmicrohttpd\],\[((\d+).(\d+).(\d+))\]') 
     {
         [string]$MHD_ver = $Matches[1].ToString()
         [string]$MHD_ver_major = $Matches[2].ToString()