[libmicrohttpd] branch master updated (9f333edb -> f602bab6)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 9f333edb Fixed possible preprocessor error when SIZE_MAX is not 
digits-only
     new 6b83cacc mhd_limits.h: use alternative name for ULLONG_MAX if available
     new d8cc7c50 mhd_limits.h: fixed copy-paste error in comment
     new 7be09c45 Fixed possible preprocessor error if ULLONG_MAX is not 
digits-only
     new f602bab6 mhd_limits.h: removed wrong alternative for SSIZE_MAX

The 4 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:
 configure.ac                | 1 +
 src/microhttpd/daemon.c     | 2 +-
 src/microhttpd/mhd_limits.h | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3ee40378..49556ebd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1117,6 +1117,7 @@ AC_CHECK_SIZEOF([size_t], [],
 #include <stdio.h>
   ]]
 )
+AC_CHECK_SIZEOF([unsigned long long], [], [[#include <stdint.h>]])
 
 AC_CHECK_HEADERS([dlfcn.h],[have_tlsplugin=yes],[have_tlsplugin=no], 
[AC_INCLUDES_DEFAULT])
 AM_CONDITIONAL([MHD_HAVE_TLS_PLUGIN], [[test "x$have_tlsplugin" = xyes]])
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index faf12c08..679bfbcb 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3921,7 +3921,7 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
       const uint64_t mssecond_left = earliest_tmot_conn->connection_timeout_ms
                                      - since_actv;
 
-#if UINT64_MAX != ULLONG_MAX
+#if SIZEOF_UINT64_T > SIZEOF_UNSIGNED_LONG_LONG
       if (mssecond_left > ULLONG_MAX)
         *timeout = ULLONG_MAX;
       else
diff --git a/src/microhttpd/mhd_limits.h b/src/microhttpd/mhd_limits.h
index b97fce6f..a4e15423 100644
--- a/src/microhttpd/mhd_limits.h
+++ b/src/microhttpd/mhd_limits.h
@@ -52,10 +52,14 @@
 #else  /* ! __LONG_MAX__ */
 #define LONG_MAX MHD_SIGNED_TYPE_MAX (long)
 #endif /* ! __LONG_MAX__ */
-#endif /* !OFF_T_MAX */
+#endif /* !LONG_MAX */
 
 #ifndef ULLONG_MAX
+#ifdef ULONGLONG_MAX
+#define ULLONG_MAX ULONGLONG_MAX
+#else  /* ! ULONGLONG_MAX */
 #define ULLONG_MAX MHD_UNSIGNED_TYPE_MAX_ (MHD_UNSIGNED_LONG_LONG)
+#endif /* ! ULONGLONG_MAX */
 #endif /* !ULLONG_MAX */
 
 #ifndef INT32_MAX
@@ -103,8 +107,6 @@
 #ifndef SSIZE_MAX
 #ifdef __SSIZE_MAX__
 #define SSIZE_MAX __SSIZE_MAX__
-#elif defined(PTRDIFF_MAX)
-#define SSIZE_MAX PTRDIFF_MAX
 #elif defined(INTPTR_MAX)
 #define SSIZE_MAX INTPTR_MAX
 #else

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