[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 02/02: Fixed builds with --disable-messages
From: |
gnunet |
Subject: |
[libmicrohttpd] 02/02: Fixed builds with --disable-messages |
Date: |
Sun, 27 Dec 2020 15:10:43 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit b5315c24cc9e6df8bc46f69b065a0a9c976f9676
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Sun Dec 27 17:07:38 2020 +0300
Fixed builds with --disable-messages
---
src/microhttpd/daemon.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 284e7e57..40ec8fc9 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -215,7 +215,7 @@ MHD_check_global_init_ (void)
#endif /* ! _AUTOINIT_FUNCS_ARE_SUPPORTED */
-
+#ifdef HAVE_MESSAGES
/**
* Default logger function
*/
@@ -231,6 +231,9 @@ MHD_default_logger_ (void *cls,
}
+#endif /* HAVE_MESSAGES */
+
+
/**
* Free the memory given by @a ptr. Calls "free(ptr)". This function
* should be used to free the username returned by
@@ -5651,14 +5654,14 @@ parse_options_va (struct MHD_Daemon *daemon,
gnutls_certificate_retrieve_function2 *);
if (0 != (daemon->options & MHD_USE_TLS))
daemon->cert_callback = pgcrf;
- else
#ifdef HAVE_MESSAGES
+ else
MHD_DLOG (daemon,
_ (
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not
set.\n"),
opt);
-#endif
- break;
+#endif /* HAVE_MESSAGES */
+ break;
#endif
case MHD_OPTION_HTTPS_CERT_CALLBACK2:
#if GNUTLS_VERSION_NUMBER < 0x030603
@@ -5673,14 +5676,14 @@ parse_options_va (struct MHD_Daemon *daemon,
gnutls_certificate_retrieve_function3 *);
if (0 != (daemon->options & MHD_USE_TLS))
daemon->cert_callback2 = pgcrf2;
- else
#ifdef HAVE_MESSAGES
+ else
MHD_DLOG (daemon,
_ (
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not
set.\n"),
opt);
-#endif
- break;
+#endif /* HAVE_MESSAGES */
+ break;
#endif
#endif /* HTTPS_SUPPORT */
#ifdef DAUTH_SUPPORT
@@ -5737,8 +5740,8 @@ parse_options_va (struct MHD_Daemon *daemon,
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
_ ("TCP fastopen is not supported on this platform.\n"));
- return MHD_NO;
#endif /* HAVE_MESSAGES */
+ return MHD_NO;
#endif /* ! TCP_FASTOPEN */
case MHD_OPTION_LISTENING_ADDRESS_REUSE:
daemon->listening_address_reuse = va_arg (ap,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.