[libmicrohttpd] branch master updated (ecf9dbb6 -> 237aebfa)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from ecf9dbb6 -fix typo
     new 2c42613c Restructured files in MSVC project
     new f45803ab MSVC project: defaults to Vista+
     new 561c52c7 MSVC projects: added missing header
     new 7de47306 mhd_align.h: fixed copy-paste error
     new c2a8933a mhd_align.h: added support for MSVC compiler
     new eb731135 mhd_str.h: fixed compilation with MSVC
     new de74ea36 test_str_tokens_remove: test corner cases
     new 23a02962 test_str_tokens_remove: shut spell checker
     new 237aebfa mhd_str: use smaller include

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/mhd_align.h               |  12 ++-
 src/microhttpd/mhd_str.h                 |   7 +-
 src/microhttpd/test_str_tokens_remove.c  |   6 +-
 w32/common/MHD_config.h                  |   2 +-
 w32/common/libmicrohttpd-files.vcxproj   |   1 +
 w32/common/libmicrohttpd-filters.vcxproj | 159 ++++++++++++++++---------------
 6 files changed, 106 insertions(+), 81 deletions(-)

diff --git a/src/microhttpd/mhd_align.h b/src/microhttpd/mhd_align.h
index 4464b6cd..30b4f15d 100644
--- a/src/microhttpd/mhd_align.h
+++ b/src/microhttpd/mhd_align.h
@@ -42,6 +42,16 @@
 
 #endif /* HAVE_C_ALIGNOF */
 
+#ifndef _MHD_ALIGNOF
+#if defined(_MSC_VER) && ! defined(__clang__) && _MSC_VER >= 1900
+/* MSVC has the same problem as older GCC versions:
+   '__alignof()' may return "preferred" alignment instead of "required",
+   but it is related to floating point variables only. */
+#define _MHD_ALIGNOF(type) __alignof(type)
+#endif /* _MSC_VER >= 1900 */
+#endif /* !_MHD_ALIGNOF */
+
+
 #ifdef offsetof
 #define _MHD_OFFSETOF(strct, membr) offsetof(strct, membr)
 #else  /* ! offsetof */
@@ -68,7 +78,7 @@ struct _mhd_dummy_uint64_offset_test
   char dummy;
   uint32_t ui64;
 };
-#define _MHD_UINT32_ALIGN \
+#define _MHD_UINT64_ALIGN \
   _MHD_OFFSETOF(struct _mhd_dummy_uint64_offset_test, ui64)
 #endif /* ! _MHD_ALIGNOF */
 
diff --git a/src/microhttpd/mhd_str.h b/src/microhttpd/mhd_str.h
index b5bb95d1..0bd46444 100644
--- a/src/microhttpd/mhd_str.h
+++ b/src/microhttpd/mhd_str.h
@@ -27,13 +27,18 @@
 #define MHD_STR_H 1
 
 #include "mhd_options.h"
-#include <stdlib.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <sys/types.h>
 #ifdef HAVE_STDBOOL_H
 #include <stdbool.h>
 #endif /* HAVE_STDBOOL_H */
 
+#if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED)
+#define _SSIZE_T_DEFINED
+typedef intptr_t ssize_t;
+#endif /* !_SSIZE_T_DEFINED */
+
 #ifdef MHD_FAVOR_SMALL_CODE
 #include "mhd_limits.h"
 #endif /* MHD_FAVOR_SMALL_CODE */
diff --git a/src/microhttpd/test_str_tokens_remove.c 
b/src/microhttpd/test_str_tokens_remove.c
index 757c0237..b14ed908 100644
--- a/src/microhttpd/test_str_tokens_remove.c
+++ b/src/microhttpd/test_str_tokens_remove.c
@@ -102,10 +102,10 @@ check_result (void)
   errcount += expect_result ("tOkEn", " \t toKEN  ", "", true);
   errcount += expect_result ("not-token, tOkEn", "token", "not-token",
                              true);
-  errcount += expect_result ("not-token, tOkEn, took", "token",
-                             "not-token, took",
+  errcount += expect_result ("not-token1, tOkEn1, token", "token1",
+                             "not-token1, token",
                              true);
-  errcount += expect_result ("toll, tOkEn", "token", "toll",
+  errcount += expect_result ("token, tOkEn1", "token1", "token",
                              true);
   errcount += expect_result ("not-token, tOkEn", " \t toKEN", "not-token",
                              true);
diff --git a/w32/common/MHD_config.h b/w32/common/MHD_config.h
index 0458ee10..7bbbc4f0 100644
--- a/w32/common/MHD_config.h
+++ b/w32/common/MHD_config.h
@@ -65,7 +65,7 @@
 
 #ifndef _WIN32_WINNT
 /* MHD supports Windows XP and later W32 systems*/
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT 0x0600
 #endif /* _WIN32_WINNT */
 
 /* winsock poll is available only on Vista and later */
diff --git a/w32/common/libmicrohttpd-files.vcxproj 
b/w32/common/libmicrohttpd-files.vcxproj
index 594a3b30..68907941 100644
--- a/w32/common/libmicrohttpd-files.vcxproj
+++ b/w32/common/libmicrohttpd-files.vcxproj
@@ -35,6 +35,7 @@
     <ClInclude Include="$(MhdSrc)microhttpd\sha256.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\mhd_assert.h" />
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_align.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\mhd_bithelpers.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h" />
     <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h" />
diff --git a/w32/common/libmicrohttpd-filters.vcxproj 
b/w32/common/libmicrohttpd-filters.vcxproj
index b74ad25a..da34a6fc 100644
--- a/w32/common/libmicrohttpd-filters.vcxproj
+++ b/w32/common/libmicrohttpd-filters.vcxproj
@@ -5,11 +5,15 @@
       
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="Header Files">
+    <Filter Include="Internal Headers">
       
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
+    <Filter Include="Public Headers">
+      
<UniqueIdentifier>{ec88d605-3383-4989-8e25-bc8efa824720}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+   <Filter Include="Resource Files">
       
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
@@ -19,20 +23,91 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(MhdSrc)include\microhttpd.h">
-      <Filter>Header Files</Filter>
+      <Filter>Public Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h">
+      <Filter>Internal Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(MhdSrc)include\platform.h">
-      <Filter>Header Files</Filter>
+      <Filter>Internal Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(MhdSrc)include\mhd_options.h">
-      <Filter>Header Files</Filter>
+      <Filter>Internal Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(MhdW32Common)MHD_config.h">
-      <Filter>Header Files</Filter>
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\base64.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\connection.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\internal.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\md5.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\sha256.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\response.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_assert.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_align.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_bithelpers.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\sysfdsetsize.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_str.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_threads.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_locks.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_sockets.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc_types.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_send.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_compat.h">
+      <Filter>Internal Headers</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -60,9 +135,6 @@
     <ClCompile Include="$(MhdSrc)microhttpd\sha256.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\sha256.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\memorypool.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -81,87 +153,24 @@
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_mono_clock.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\base64.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\connection.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\internal.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\md5.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\response.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_assert.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_bithelpers.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\sysfdsetsize.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\sysfdsetsize.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_str.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_str.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_threads.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_threads.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_locks.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_sockets.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_sockets.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc_types.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_itc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_send.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_send.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_compat.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_compat.c">
       <Filter>Source Files</Filter>
     </ClCompile>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.