diff options
| author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2023-11-08 20:32:53 +0300 |
|---|---|---|
| committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2023-11-08 20:32:53 +0300 |
| commit | ede33803c6952a42d65cef9e351bc30ea2cea91d (patch) | |
| tree | 8f726ea3395e1ab10703d0b8d2be464c62e67835 | |
| parent | 32eae456fddba5b48d08f44dda956a0ea1ffffea (diff) | |
| download | libmicrohttpd-ede33803c6952a42d65cef9e351bc30ea2cea91d.tar.gz libmicrohttpd-ede33803c6952a42d65cef9e351bc30ea2cea91d.zip | |
Fixed merge conflict introduced by 32eae456fddba5b48d08f44dda956a0ea1ffffea
| -rw-r--r-- | src/microhttpd/daemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index d8151bea..9fc7ac0b 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
| @@ -4627,8 +4627,8 @@ MHD_run_from_select2 (struct MHD_Daemon *daemon, | |||
| 4627 | MHD_DLOG (daemon, | 4627 | MHD_DLOG (daemon, |
| 4628 | _ ("%s() called with fd_setsize (%u) " \ | 4628 | _ ("%s() called with fd_setsize (%u) " \ |
| 4629 | "less than fixed FD_SETSIZE value (%d) used on the " \ | 4629 | "less than fixed FD_SETSIZE value (%d) used on the " \ |
| 4630 | "platform.\n", "MHD_run_from_select2"), | 4630 | "platform.\n"), |
| 4631 | fd_setsize, (int) FD_SETSIZE); | 4631 | "MHD_run_from_select2", fd_setsize, (int) FD_SETSIZE); |
| 4632 | #endif /* HAVE_MESSAGES */ | 4632 | #endif /* HAVE_MESSAGES */ |
| 4633 | return MHD_NO; | 4633 | return MHD_NO; |
| 4634 | } | 4634 | } |