[libmicrohttpd] branch master updated (3aee48fd -> 2e14003e)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 3aee48fd Releasing GNU libmicrohttpd 1.0.1
     new fd498a70 Bump MHD_VERSION to indicate development version
     new 4e056c97 microhttpd.h: fixed feature name
     new 2e14003e microhttpd.h: workaround for uncrustify bug

The 3 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/include/microhttpd.h | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index ca27b6c4..12b872fc 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -80,13 +80,18 @@
 #ifndef MHD_MICROHTTPD_H
 #define MHD_MICROHTTPD_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
+#ifndef __cplusplus
+#  define MHD_C_DECLRATIONS_START_HERE_   /* Empty */
+#  define MHD_C_DECLRATIONS_FINISH_HERE_  /* Empty */
+#else  /* __cplusplus */
+/* *INDENT-OFF* */
+#  define MHD_C_DECLRATIONS_START_HERE_   extern "C" {
+#  define MHD_C_DECLRATIONS_FINISH_HERE_  }
+/* *INDENT-ON* */
+#endif /* __cplusplus */
+
+
+MHD_C_DECLRATIONS_START_HERE_
 
 
 /**
@@ -96,7 +101,7 @@ extern "C"
  * they are parsed as decimal numbers.
  * Example: 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x01000100
+#define MHD_VERSION 0x01000101
 
 /* If generic headers don't work on your platform, include headers
    which define 'va_list', 'size_t', 'ssize_t', 'intptr_t', 'off_t',
@@ -6403,9 +6408,9 @@ enum MHD_FEATURE
    * Get whether automatic parsing of HTTP Cookie header is supported.
    * If disabled, no MHD_COOKIE_KIND will be generated by MHD.
    * MHD versions before 0x00097701 always support cookie parsing.
-   * @note Available since #MHD_VERSION 0x00097701
+   * @note Available since #MHD_VERSION 0x01000200
    */
-  MHD_FEATURE_HTTPS_COOKIE_PARSING = 24,
+  MHD_FEATURE_COOKIE_PARSING = 24,
 
   /**
    * Get whether the early version the Digest Authorization (RFC 2069) is
@@ -6499,6 +6504,10 @@ enum MHD_FEATURE
   MHD_FEATURE_FLEXIBLE_FD_SETSIZE = 34
 };
 
+#define MHD_FEATURE_HTTPS_COOKIE_PARSING _MHD_DEPR_IN_MACRO ( \
+    "Value MHD_FEATURE_HTTPS_COOKIE_PARSING is deprecated, " \
+    "use MHD_FEATURE_COOKIE_PARSING" \
+    ) MHD_FEATURE_COOKIE_PARSING
 
 /**
  * Get information about supported MHD features.
@@ -6515,11 +6524,6 @@ _MHD_EXTERN enum MHD_Result
 MHD_is_feature_supported (enum MHD_FEATURE feature);
 
 
-#ifdef __cplusplus
-#if 0                           /* keep Emacsens' auto-indent happy */
-{
-#endif
-}
-#endif
+MHD_C_DECLRATIONS_FINISH_HERE_
 
 #endif

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