shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

microhttpd-util: silence warnings about deprecated options

Browse Source 
C.f. 21b6ff3684.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-19 16:37:24 -04:00
parent 4fa3993be9
commit 58eb279840
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/journal-remote/journal-remote.c
View File

@ -529,7 +529,7 @@ static int process_http_upload(
log_warning("Failed to process data for connection %p", connection); log_warning("Failed to process data for connection %p", connection);
if (r == -E2BIG) if (r == -E2BIG)
return mhd_respondf(connection, return mhd_respondf(connection,
r, MHD_HTTP_REQUEST_ENTITY_TOO_LARGE, r, MHD_HTTP_PAYLOAD_TOO_LARGE,
"Entry is too large, maximum is " STRINGIFY(DATA_SIZE_MAX) " bytes."); "Entry is too large, maximum is " STRINGIFY(DATA_SIZE_MAX) " bytes.");
else else
return mhd_respondf(connection, return mhd_respondf(connection,

13
src/journal-remote/microhttpd-util.h
View File

@ -31,14 +31,21 @@
# define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE # define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE
#endif #endif
/* Renamed in µhttpd 0.9.51 */
#ifndef MHD_USE_PIPE_FOR_SHUTDOWN
# define MHD_USE_ITC MHD_USE_PIPE_FOR_SHUTDOWN
#endif
/* Renamed in µhttpd 0.9.52 */ /* Renamed in µhttpd 0.9.52 */
#ifndef MHD_USE_EPOLL_LINUX_ONLY #ifndef MHD_USE_EPOLL_LINUX_ONLY
# define MHD_USE_EPOLL MHD_USE_EPOLL_LINUX_ONLY # define MHD_USE_EPOLL MHD_USE_EPOLL_LINUX_ONLY
#endif #endif
/* Renamed in µhttpd 0.9.51 */ /* Both the old and new names are defines, check for the new one. */
#ifndef MHD_USE_PIPE_FOR_SHUTDOWN
# define MHD_USE_ITC MHD_USE_PIPE_FOR_SHUTDOWN /* Renamed in µhttpd 0.9.53 */
#ifndef MHD_HTTP_PAYLOAD_TOO_LARGE
# define MHD_HTTP_PAYLOAD_TOO_LARGE MHD_HTTP_REQUEST_ENTITY_TOO_LARGE
#endif #endif
#if MHD_VERSION < 0x00094203 #if MHD_VERSION < 0x00094203