commit 7be09c451202bbe39e11e81348edb1aae8fdb122
parent d8cc7c50f0b47ba8fe1d36bd9f76a125c5e767d5
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Thu, 2 Sep 2021 14:58:10 +0300
Fixed possible preprocessor error if ULLONG_MAX is not digits-only
Diffstat:
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git 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
@@ -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