diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-10-06 18:09:34 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-10-06 18:09:34 +0000 |
commit | 48b38bdbbea2ce2b7ea6aabfbbf95c54ad8cb014 (patch) | |
tree | e3ddd95854fc082ce0bba9f7ba4885579596819e /w32 | |
parent | f2426d2b0ff551f3585eda7f68fe1e7c8e4aa5c4 (diff) | |
download | libmicrohttpd-48b38bdbbea2ce2b7ea6aabfbbf95c54ad8cb014.tar.gz libmicrohttpd-48b38bdbbea2ce2b7ea6aabfbbf95c54ad8cb014.zip |
Fixed VS builds.
Diffstat (limited to 'w32')
-rw-r--r-- | w32/common/MHD_config.h | 10 | ||||
-rw-r--r-- | w32/common/gen_dll_res.ps1 | 2 |
2 files changed, 1 insertions, 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 @@ | |||
60 | #define HAVE_POLL 1 | 60 | #define HAVE_POLL 1 |
61 | #endif /* _WIN32_WINNT >= 0x0600 */ | 61 | #endif /* _WIN32_WINNT >= 0x0600 */ |
62 | 62 | ||
63 | /* define to 0 to disable epoll support */ | ||
64 | #define EPOLL_SUPPORT 0 | ||
65 | |||
66 | /* Define to 1 if you have the <winsock2.h> header file. */ | 63 | /* Define to 1 if you have the <winsock2.h> header file. */ |
67 | #define HAVE_WINSOCK2_H 1 | 64 | #define HAVE_WINSOCK2_H 1 |
68 | 65 | ||
69 | /* Define to 1 if you have the <ws2tcpip.h> header file. */ | 66 | /* Define to 1 if you have the <ws2tcpip.h> header file. */ |
70 | #define HAVE_WS2TCPIP_H 1 | 67 | #define HAVE_WS2TCPIP_H 1 |
71 | 68 | ||
72 | /* Define to 1 if you have the declaration of `SOCK_NONBLOCK', and to 0 if you | ||
73 | don't. */ | ||
74 | #define HAVE_DECL_SOCK_NONBLOCK 0 | ||
75 | |||
76 | /* Define to 1 if you have the `_lseeki64' function. */ | 69 | /* Define to 1 if you have the `_lseeki64' function. */ |
77 | #define HAVE___LSEEKI64 1 | 70 | #define HAVE___LSEEKI64 1 |
78 | 71 | ||
@@ -114,9 +107,6 @@ | |||
114 | /* Define to 1 if you have the <memory.h> header file. */ | 107 | /* Define to 1 if you have the <memory.h> header file. */ |
115 | #define HAVE_MEMORY_H 1 | 108 | #define HAVE_MEMORY_H 1 |
116 | 109 | ||
117 | /* Define to 1 if you have the <pthread.h> header file. */ | ||
118 | #define HAVE_PTHREAD_H 0 | ||
119 | |||
120 | /* Define to 1 if you have the <stdint.h> header file. */ | 110 | /* Define to 1 if you have the <stdint.h> header file. */ |
121 | #define HAVE_STDINT_H 1 | 111 | #define HAVE_STDINT_H 1 |
122 | 112 | ||
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 | |||
8 | Write-Output "Processing: ${BasePath}..\..\configure.ac" | 8 | Write-Output "Processing: ${BasePath}..\..\configure.ac" |
9 | foreach($line in Get-Content "${BasePath}..\..\configure.ac") | 9 | foreach($line in Get-Content "${BasePath}..\..\configure.ac") |
10 | { | 10 | { |
11 | if ($line -match '^AC_INIT\(\[libmicrohttpd\],\[((\d+).(\d+).(\d+))\]') | 11 | if ($line -match '^AC_INIT\(\[(?:GNU )?libmicrohttpd\],\[((\d+).(\d+).(\d+))\]') |
12 | { | 12 | { |
13 | [string]$MHD_ver = $Matches[1].ToString() | 13 | [string]$MHD_ver = $Matches[1].ToString() |
14 | [string]$MHD_ver_major = $Matches[2].ToString() | 14 | [string]$MHD_ver_major = $Matches[2].ToString() |