commit ede33803c6952a42d65cef9e351bc30ea2cea91d
parent 32eae456fddba5b48d08f44dda956a0ea1ffffea
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Wed, 8 Nov 2023 20:32:53 +0300
Fixed merge conflict introduced by 32eae456fddba5b48d08f44dda956a0ea1ffffea
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -4627,8 +4627,8 @@ MHD_run_from_select2 (struct MHD_Daemon *daemon,
MHD_DLOG (daemon,
_ ("%s() called with fd_setsize (%u) " \
"less than fixed FD_SETSIZE value (%d) used on the " \
- "platform.\n", "MHD_run_from_select2"),
- fd_setsize, (int) FD_SETSIZE);
+ "platform.\n"),
+ "MHD_run_from_select2", fd_setsize, (int) FD_SETSIZE);
#endif /* HAVE_MESSAGES */
return MHD_NO;
}