[GNUnet-SVN] r38075 - libmicrohttpd/w32/common

[gnunet]

Author: Karlson2k
Date: 2016-10-06 20:09:34 +0200 (Thu, 06 Oct 2016)
New Revision: 38075

Modified:
   libmicrohttpd/w32/common/MHD_config.h
   libmicrohttpd/w32/common/gen_dll_res.ps1
Log:
Fixed VS builds.

Modified: libmicrohttpd/w32/common/MHD_config.h
===================================================================
--- libmicrohttpd/w32/common/MHD_config.h       2016-10-06 16:01:51 UTC (rev 
38074)
+++ libmicrohttpd/w32/common/MHD_config.h       2016-10-06 18:09:34 UTC (rev 
38075)
@@ -60,9 +60,6 @@
 #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
 
@@ -69,10 +66,6 @@
 /* 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
 

Modified: libmicrohttpd/w32/common/gen_dll_res.ps1
===================================================================
--- libmicrohttpd/w32/common/gen_dll_res.ps1    2016-10-06 16:01:51 UTC (rev 
38074)
+++ libmicrohttpd/w32/common/gen_dll_res.ps1    2016-10-06 18:09:34 UTC (rev 
38075)
@@ -8,7 +8,7 @@
 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()