[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37763 - in libmicrohttpd: src/include src/microhttpd src/p
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r37763 - in libmicrohttpd: src/include src/microhttpd src/platform w32/common |
|
Date: |
Tue, 23 Aug 2016 22:12:57 +0200 |
Author: Karlson2k
Date: 2016-08-23 22:12:56 +0200 (Tue, 23 Aug 2016)
New Revision: 37763
Added:
libmicrohttpd/src/microhttpd/mhd_itc.c
libmicrohttpd/src/microhttpd/mhd_itc.h
Modified:
libmicrohttpd/src/include/platform.h
libmicrohttpd/src/include/platform_interface.h
libmicrohttpd/src/include/w32functions.h
libmicrohttpd/src/microhttpd/Makefile.am
libmicrohttpd/src/microhttpd/daemon.c
libmicrohttpd/src/microhttpd/internal.h
libmicrohttpd/src/platform/w32functions.c
libmicrohttpd/w32/common/libmicrohttpd-files.vcxproj
libmicrohttpd/w32/common/libmicrohttpd-filters.vcxproj
Log:
Moved pipe/socketpair to separate mhd_itc.h/.c files.
Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h 2016-08-23 20:12:50 UTC (rev
37762)
+++ libmicrohttpd/src/include/platform.h 2016-08-23 20:12:56 UTC (rev
37763)
@@ -124,20 +124,6 @@
typedef long _MHD_TIMEVAL_TV_SEC_TYPE;
#endif /* _WIN32 */
-/* TODO: remove include when pipes implementation is moved to other file */
-#include "../microhttpd/mhd_sockets.h"
-/* Force don't use pipes on W32 */
-#if defined(_WIN32) && !defined(MHD_DONT_USE_PIPES)
-#define MHD_DONT_USE_PIPES 1
-#endif /* defined(_WIN32) && !defined(MHD_DONT_USE_PIPES) */
-
-/* MHD_pipe is type for pipe FDs*/
-#ifndef MHD_DONT_USE_PIPES
-typedef int MHD_pipe;
-#else /* ! MHD_DONT_USE_PIPES */
-typedef MHD_socket MHD_pipe;
-#endif /* ! MHD_DONT_USE_PIPES */
-
#if !defined(IPPROTO_IPV6) && defined(_MSC_FULL_VER) && _WIN32_WINNT >= 0x0501
/* VC use IPPROTO_IPV6 as part of enum */
#define IPPROTO_IPV6 IPPROTO_IPV6
Modified: libmicrohttpd/src/include/platform_interface.h
===================================================================
--- libmicrohttpd/src/include/platform_interface.h 2016-08-23 20:12:50 UTC
(rev 37762)
+++ libmicrohttpd/src/include/platform_interface.h 2016-08-23 20:12:56 UTC
(rev 37763)
@@ -27,7 +27,6 @@
#define MHD_PLATFORM_INTERFACE_H
#include "platform.h"
-#include "../microhttpd/mhd_sockets.h"
#if defined(_WIN32) && !defined(__CYGWIN__)
#include "w32functions.h"
#endif
@@ -47,66 +46,7 @@
#endif /* ! _WIN32*/
#endif /* ! HAVE_SNPRINTF */
-/* MHD_pipe_ create pipe (!MHD_DONT_USE_PIPES) /
- * create two connected sockets (MHD_DONT_USE_PIPES) */
-#ifndef MHD_DONT_USE_PIPES
-#define MHD_pipe_(fdarr) pipe((fdarr))
-#else /* MHD_DONT_USE_PIPES */
#if !defined(_WIN32) || defined(__CYGWIN__)
-#define MHD_pipe_(fdarr) socketpair(AF_LOCAL, SOCK_STREAM, 0, (fdarr))
-#else /* !defined(_WIN32) || defined(__CYGWIN__) */
-#define MHD_pipe_(fdarr) MHD_W32_pair_of_sockets_((fdarr))
-#endif /* !defined(_WIN32) || defined(__CYGWIN__) */
-#endif /* MHD_DONT_USE_PIPES */
-
-/* MHD_pipe_errno_ is errno of last function (!MHD_DONT_USE_PIPES) /
- * errno of last emulated pipe function
(MHD_DONT_USE_PIPES) */
-#ifndef MHD_DONT_USE_PIPES
-#define MHD_pipe_errno_ errno
-#else
-#define MHD_pipe_errno_ MHD_socket_errno_
-#endif
-
-/* MHD_pipe_last_strerror_ is description string of last errno
(!MHD_DONT_USE_PIPES) /
- * description string of last pipe error
(MHD_DONT_USE_PIPES) */
-#ifndef MHD_DONT_USE_PIPES
-#define MHD_pipe_last_strerror_() strerror(errno)
-#else
-#define MHD_pipe_last_strerror_() MHD_socket_last_strerr_()
-#endif
-
-/* MHD_pipe_write_ write data to real pipe (!MHD_DONT_USE_PIPES) /
- * write data to emulated pipe (MHD_DONT_USE_PIPES) */
-#ifndef MHD_DONT_USE_PIPES
-#define MHD_pipe_write_(fd, ptr, sz) write((fd), (const void*)(ptr), (sz))
-#else
-#define MHD_pipe_write_(fd, ptr, sz) send((fd), (const char*)(ptr), (sz), 0)
-#endif
-
-/* MHD_pipe_drain_ drain data from real pipe (!MHD_DONT_USE_PIPES) /
- * drain data from emulated pipe (MHD_DONT_USE_PIPES) */
-#ifndef MHD_DONT_USE_PIPES
-#define MHD_pipe_drain_(fd) do { long tmp; while (0 < read((fd), (void*)&tmp,
sizeof (tmp))) ; } while (0)
-#else
-#define MHD_pipe_drain_(fd) do { long tmp; while (0 < recv((fd), (void*)&tmp,
sizeof (tmp), 0)) ; } while (0)
-#endif
-
-/* MHD_pipe_close_(fd) close any FDs (non-W32) /
- * close emulated pipe FDs (W32) */
-#ifndef MHD_DONT_USE_PIPES
-#define MHD_pipe_close_(fd) close((fd))
-#else
-#define MHD_pipe_close_(fd) MHD_socket_close_((fd))
-#endif
-
-/* MHD_INVALID_PIPE_ is a value of bad pipe FD */
-#ifndef MHD_DONT_USE_PIPES
-#define MHD_INVALID_PIPE_ (-1)
-#else
-#define MHD_INVALID_PIPE_ MHD_INVALID_SOCKET
-#endif
-
-#if !defined(_WIN32) || defined(__CYGWIN__)
#define MHD_random_() random()
#else
#define MHD_random_() MHD_W32_random_()
Modified: libmicrohttpd/src/include/w32functions.h
===================================================================
--- libmicrohttpd/src/include/w32functions.h 2016-08-23 20:12:50 UTC (rev
37762)
+++ libmicrohttpd/src/include/w32functions.h 2016-08-23 20:12:56 UTC (rev
37763)
@@ -40,13 +40,6 @@
#endif
/**
- * Create pair of mutually connected TCP/IP sockets on loopback address
- * @param sockets_pair array to receive resulted sockets
- * @return zero on success, -1 otherwise
- */
-int MHD_W32_pair_of_sockets_(SOCKET sockets_pair[2]);
-
-/**
* Generate 31-bit pseudo random number.
* Function initialize itself at first call to current time.
* @return 31-bit pseudo random number.
Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am 2016-08-23 20:12:50 UTC (rev
37762)
+++ libmicrohttpd/src/microhttpd/Makefile.am 2016-08-23 20:12:56 UTC (rev
37763)
@@ -70,6 +70,7 @@
mhd_threads.c mhd_threads.h \
mhd_locks.h \
mhd_sockets.c mhd_sockets.h \
+ mhd_itc.c mhd_itc.h \
response.c response.h
libmicrohttpd_la_CPPFLAGS = \
$(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2016-08-23 20:12:50 UTC (rev
37762)
+++ libmicrohttpd/src/microhttpd/daemon.c 2016-08-23 20:12:56 UTC (rev
37763)
@@ -35,6 +35,7 @@
#include "mhd_mono_clock.h"
#include "mhd_locks.h"
#include "mhd_sockets.h"
+#include "mhd_itc.h"
#if HAVE_SEARCH_H
#include <search.h>
Modified: libmicrohttpd/src/microhttpd/internal.h
===================================================================
--- libmicrohttpd/src/microhttpd/internal.h 2016-08-23 20:12:50 UTC (rev
37762)
+++ libmicrohttpd/src/microhttpd/internal.h 2016-08-23 20:12:56 UTC (rev
37763)
@@ -39,6 +39,7 @@
#include "mhd_threads.h"
#include "mhd_locks.h"
#include "mhd_sockets.h"
+#include "mhd_itc.h"
/**
Copied: libmicrohttpd/src/microhttpd/mhd_itc.c (from rev 37762,
libmicrohttpd/src/platform/w32functions.c)
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_itc.c (rev 0)
+++ libmicrohttpd/src/microhttpd/mhd_itc.c 2016-08-23 20:12:56 UTC (rev
37763)
@@ -0,0 +1,108 @@
+/*
+ This file is part of libmicrohttpd
+ Copyright (C) 2016 Karlson2k (Evgeny Grin)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+
+*/
+
+/**
+ * @file microhttpd/mhd_sockets.c
+ * @brief Implementation of inter-thread communication functions
+ * @author Karlson2k (Evgeny Grin)
+ */
+
+#include "mhd_itc.h"
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+/**
+ * Create pair of mutually connected TCP/IP sockets on loopback address
+ * @param sockets_pair array to receive resulted sockets
+ * @return zero on success, -1 otherwise
+ */
+int MHD_W32_pair_of_sockets_(SOCKET sockets_pair[2])
+{
+ int i;
+ if (!sockets_pair)
+ {
+ errno = EINVAL;
+ return -1;
+ }
+
+#define PAIRMAXTRYIES 800
+ for (i = 0; i < PAIRMAXTRYIES; i++)
+ {
+ struct sockaddr_in listen_addr;
+ SOCKET listen_s;
+ static const int c_addinlen = sizeof(struct sockaddr_in); /* help
compiler to optimize */
+ int addr_len = c_addinlen;
+ int opt = 1;
+
+ listen_s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (INVALID_SOCKET == listen_s)
+ break; /* can't create even single socket */
+
+ listen_addr.sin_family = AF_INET;
+ listen_addr.sin_port = htons(0);
+ listen_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ if (0 == bind(listen_s, (struct sockaddr*) &listen_addr, c_addinlen)
+ && 0 == listen(listen_s, 1)
+ && 0 == getsockname(listen_s, (struct sockaddr*) &listen_addr,
+ &addr_len))
+ {
+ SOCKET client_s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (INVALID_SOCKET != client_s)
+ {
+ if (0 == ioctlsocket(client_s, FIONBIO, (u_long*) &opt)
+ && (0 == connect(client_s, (struct sockaddr*) &listen_addr,
c_addinlen)
+ || WSAGetLastError() == WSAEWOULDBLOCK))
+ {
+ struct sockaddr_in accepted_from_addr;
+ SOCKET server_s;
+ addr_len = c_addinlen;
+ server_s = accept(listen_s,
+ (struct sockaddr*) &accepted_from_addr, &addr_len);
+ if (INVALID_SOCKET != server_s)
+ {
+ struct sockaddr_in client_addr;
+ addr_len = c_addinlen;
+ opt = 0;
+ if (0 == getsockname(client_s, (struct sockaddr*)
&client_addr, &addr_len)
+ && accepted_from_addr.sin_family ==
client_addr.sin_family
+ && accepted_from_addr.sin_port ==
client_addr.sin_port
+ && accepted_from_addr.sin_addr.s_addr ==
client_addr.sin_addr.s_addr
+ && 0 == ioctlsocket(client_s, FIONBIO, (u_long*)
&opt)
+ && 0 == ioctlsocket(server_s, FIONBIO, (u_long*)
&opt))
+ {
+ closesocket(listen_s);
+ sockets_pair[0] = client_s;
+ sockets_pair[1] = server_s;
+ return 0;
+ }
+ closesocket(server_s);
+ }
+ }
+ closesocket(client_s);
+ }
+ }
+ closesocket(listen_s);
+ }
+
+ sockets_pair[0] = INVALID_SOCKET;
+ sockets_pair[1] = INVALID_SOCKET;
+ return -1;
+}
+
+#endif /* _WIN32 && ! __CYGWIN__ */
Added: libmicrohttpd/src/microhttpd/mhd_itc.h
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_itc.h (rev 0)
+++ libmicrohttpd/src/microhttpd/mhd_itc.h 2016-08-23 20:12:56 UTC (rev
37763)
@@ -0,0 +1,118 @@
+/*
+ This file is part of libmicrohttpd
+ Copyright (C) 2016 Karlson2k (Evgeny Grin)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+
+*/
+
+/**
+ * @file microhttpd/mhd_sockets.c
+ * @brief Header for platform-independent inter-thread communication
+ * @author Karlson2k (Evgeny Grin)
+ *
+ * Provides basic abstraction for inter-thread communication.
+ * Any functions can be implemented as macro on some platforms
+ * unless explicitly marked otherwise.
+ * Any function argument can be skipped in macro, so avoid
+ * variable modification in function parameters.
+ */
+
+#ifndef MHD_ITC_H
+#define MHD_ITC_H 1
+#include "mhd_options.h"
+
+/* Force don't use pipes on W32 */
+#if defined(_WIN32) && !defined(MHD_DONT_USE_PIPES)
+#define MHD_DONT_USE_PIPES 1
+#endif /* defined(_WIN32) && !defined(MHD_DONT_USE_PIPES) */
+
+#ifndef MHD_DONT_USE_PIPES
+# ifdef HAVE_STRING_H
+# include <string.h> /* for strerror() */
+# endif
+#else
+# include "mhd_sockets.h"
+#endif /* MHD_DONT_USE_PIPES */
+
+/* MHD_pipe is type for pipe FDs*/
+#ifndef MHD_DONT_USE_PIPES
+ typedef int MHD_pipe;
+#else /* ! MHD_DONT_USE_PIPES */
+ typedef MHD_socket MHD_pipe;
+#endif /* ! MHD_DONT_USE_PIPES */
+
+/* MHD_pipe_ create pipe (!MHD_DONT_USE_PIPES) /
+ * create two connected sockets (MHD_DONT_USE_PIPES) */
+#ifndef MHD_DONT_USE_PIPES
+# define MHD_pipe_(fdarr) pipe((fdarr))
+#else /* MHD_DONT_USE_PIPES */
+# if !defined(_WIN32) || defined(__CYGWIN__)
+# define MHD_pipe_(fdarr) socketpair(AF_LOCAL, SOCK_STREAM, 0, (fdarr))
+# else /* !defined(_WIN32) || defined(__CYGWIN__) */
+# define MHD_pipe_(fdarr) MHD_W32_pair_of_sockets_((fdarr))
+# endif /* !defined(_WIN32) || defined(__CYGWIN__) */
+#endif /* MHD_DONT_USE_PIPES */
+
+/* MHD_pipe_last_strerror_ is description string of last errno
(!MHD_DONT_USE_PIPES) /
+ * description string of last pipe error
(MHD_DONT_USE_PIPES) */
+#ifndef MHD_DONT_USE_PIPES
+# define MHD_pipe_last_strerror_() strerror(errno)
+#else
+# define MHD_pipe_last_strerror_() MHD_socket_last_strerr_()
+#endif
+
+/* MHD_pipe_write_ write data to real pipe (!MHD_DONT_USE_PIPES) /
+ * write data to emulated pipe (MHD_DONT_USE_PIPES) */
+#ifndef MHD_DONT_USE_PIPES
+# define MHD_pipe_write_(fd, ptr, sz) write((fd), (const void*)(ptr), (sz))
+#else
+# define MHD_pipe_write_(fd, ptr, sz) send((fd), (const char*)(ptr), (sz), 0)
+#endif
+
+/* MHD_pipe_drain_ drain data from real pipe (!MHD_DONT_USE_PIPES) /
+ * drain data from emulated pipe (MHD_DONT_USE_PIPES) */
+#ifndef MHD_DONT_USE_PIPES
+# define MHD_pipe_drain_(fd) do { long tmp; while (0 < read((fd),
(void*)&tmp, sizeof (tmp))) ; } while (0)
+#else
+# define MHD_pipe_drain_(fd) do { long tmp; while (0 < recv((fd),
(void*)&tmp, sizeof (tmp), 0)) ; } while (0)
+#endif
+
+/* MHD_pipe_close_(fd) close any FDs (non-W32) /
+ * close emulated pipe FDs (W32) */
+#ifndef MHD_DONT_USE_PIPES
+# define MHD_pipe_close_(fd) close((fd))
+#else
+# define MHD_pipe_close_(fd) MHD_socket_close_((fd))
+#endif
+
+/* MHD_INVALID_PIPE_ is a value of bad pipe FD */
+#ifndef MHD_DONT_USE_PIPES
+# define MHD_INVALID_PIPE_ (-1)
+#else
+# define MHD_INVALID_PIPE_ MHD_INVALID_SOCKET
+#endif
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+/**
+ * Create pair of mutually connected TCP/IP sockets on loopback address
+ * @param sockets_pair array to receive resulted sockets
+ * @return zero on success, -1 otherwise
+ */
+int MHD_W32_pair_of_sockets_(SOCKET sockets_pair[2]);
+#endif /* _WIN32 && ! __CYGWIN__ */
+
+
+#endif /* MHD_ITC_H */
Modified: libmicrohttpd/src/platform/w32functions.c
===================================================================
--- libmicrohttpd/src/platform/w32functions.c 2016-08-23 20:12:50 UTC (rev
37762)
+++ libmicrohttpd/src/platform/w32functions.c 2016-08-23 20:12:56 UTC (rev
37763)
@@ -24,94 +24,13 @@
*/
#include "w32functions.h"
-#include <errno.h>
-#include <winsock2.h>
#include <string.h>
#include <stdint.h>
#include <time.h>
#include <stdio.h>
#include <stdarg.h>
-#include "../microhttpd/mhd_sockets.h"
/**
- * Create pair of mutually connected TCP/IP sockets on loopback address
- * @param sockets_pair array to receive resulted sockets
- * @return zero on success, -1 otherwise
- */
-int MHD_W32_pair_of_sockets_(SOCKET sockets_pair[2])
-{
- int i;
- if (!sockets_pair)
- {
- errno = EINVAL;
- return -1;
- }
-
-#define PAIRMAXTRYIES 800
- for (i = 0; i < PAIRMAXTRYIES; i++)
- {
- struct sockaddr_in listen_addr;
- SOCKET listen_s;
- static const int c_addinlen = sizeof(struct sockaddr_in); /* help
compiler to optimize */
- int addr_len = c_addinlen;
- int opt = 1;
-
- listen_s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (INVALID_SOCKET == listen_s)
- break; /* can't create even single socket */
-
- listen_addr.sin_family = AF_INET;
- listen_addr.sin_port = htons(0);
- listen_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- if (0 == bind(listen_s, (struct sockaddr*) &listen_addr, c_addinlen)
- && 0 == listen(listen_s, 1)
- && 0 == getsockname(listen_s, (struct sockaddr*) &listen_addr,
- &addr_len))
- {
- SOCKET client_s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (INVALID_SOCKET != client_s)
- {
- if (0 == ioctlsocket(client_s, FIONBIO, (u_long*) &opt)
- && (0 == connect(client_s, (struct sockaddr*) &listen_addr,
c_addinlen)
- || WSAGetLastError() == WSAEWOULDBLOCK))
- {
- struct sockaddr_in accepted_from_addr;
- SOCKET server_s;
- addr_len = c_addinlen;
- server_s = accept(listen_s,
- (struct sockaddr*) &accepted_from_addr, &addr_len);
- if (INVALID_SOCKET != server_s)
- {
- struct sockaddr_in client_addr;
- addr_len = c_addinlen;
- opt = 0;
- if (0 == getsockname(client_s, (struct sockaddr*)
&client_addr, &addr_len)
- && accepted_from_addr.sin_family ==
client_addr.sin_family
- && accepted_from_addr.sin_port ==
client_addr.sin_port
- && accepted_from_addr.sin_addr.s_addr ==
client_addr.sin_addr.s_addr
- && 0 == ioctlsocket(client_s, FIONBIO, (u_long*)
&opt)
- && 0 == ioctlsocket(server_s, FIONBIO, (u_long*)
&opt))
- {
- closesocket(listen_s);
- sockets_pair[0] = client_s;
- sockets_pair[1] = server_s;
- return 0;
- }
- closesocket(server_s);
- }
- }
- closesocket(client_s);
- }
- }
- closesocket(listen_s);
- }
-
- sockets_pair[0] = INVALID_SOCKET;
- sockets_pair[1] = INVALID_SOCKET;
- return -1;
-}
-
-/**
* Static variable used by pseudo random number generator
*/
static int32_t rnd_val = 0;
Modified: libmicrohttpd/w32/common/libmicrohttpd-files.vcxproj
===================================================================
--- libmicrohttpd/w32/common/libmicrohttpd-files.vcxproj 2016-08-23
20:12:50 UTC (rev 37762)
+++ libmicrohttpd/w32/common/libmicrohttpd-files.vcxproj 2016-08-23
20:12:56 UTC (rev 37763)
@@ -18,6 +18,7 @@
<ClCompile Include="$(MhdSrc)microhttpd\mhd_str.c" />
<ClCompile Include="$(MhdSrc)microhttpd\mhd_threads.c" />
<ClCompile Include="$(MhdSrc)microhttpd\mhd_sockets.c" />
+ <ClCompile Include="$(MhdSrc)microhttpd\mhd_itc.c" />
<ClCompile Include="$(MhdSrc)platform\w32functions.c" />
</ItemGroup>
<ItemGroup>
@@ -42,6 +43,7 @@
<ClInclude Include="$(MhdSrc)microhttpd\mhd_threads.h" />
<ClInclude Include="$(MhdSrc)microhttpd\mhd_locks.h" />
<ClInclude Include="$(MhdSrc)microhttpd\mhd_sockets.h" />
+ <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc.h" />
<ClInclude Include="$(MhdW32Common)MHD_config.h" />
</ItemGroup>
<ItemGroup>
Modified: libmicrohttpd/w32/common/libmicrohttpd-filters.vcxproj
===================================================================
--- libmicrohttpd/w32/common/libmicrohttpd-filters.vcxproj 2016-08-23
20:12:50 UTC (rev 37762)
+++ libmicrohttpd/w32/common/libmicrohttpd-filters.vcxproj 2016-08-23
20:12:56 UTC (rev 37763)
@@ -145,6 +145,12 @@
<ClCompile Include="$(MhdSrc)microhttpd\mhd_sockets.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClCompile Include="$(MhdSrc)microhttpd\mhd_itc.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="$(MhdW32Common)microhttpd_dll_res_vc.rc">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37763 - in libmicrohttpd: src/include src/microhttpd src/platform w32/common,
gnunet <=