diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-06-30 09:56:10 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-07-01 13:10:48 +0900 |
| commit | d17eabb1052e7c8c432331a7a782845e36164f01 (patch) | |
| tree | f28be69fb4d674b2e4b1e1581d899f09e2898dd8 /src/journal-remote | |
| parent | 116739cfb61bfff8adb65828a2955d047ba2eb01 (diff) | |
| download | systemd-d17eabb1052e7c8c432331a7a782845e36164f01.tar.gz | |
Fix build with µhttpd 0.9.71
The return type of callbacks was changed from int to an enum.
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-gatewayd.c | 4 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote-main.c | 2 | ||||
| -rw-r--r-- | src/journal-remote/microhttpd-util.h | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 5177e0d157..3ab7c98b0b 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -349,7 +349,7 @@ static int request_parse_range( return 0; } -static int request_parse_arguments_iterator( +static mhd_result request_parse_arguments_iterator( void *cls, enum MHD_ValueKind kind, const char *key, @@ -796,7 +796,7 @@ static int request_handler_machine( return MHD_queue_response(connection, MHD_HTTP_OK, response); } -static int request_handler( +static mhd_result request_handler( void *cls, struct MHD_Connection *connection, const char *url, diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 69a111afea..f82d188a8c 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -253,7 +253,7 @@ static int process_http_upload( return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK."); }; -static int request_handler( +static mhd_result request_handler( void *cls, struct MHD_Connection *connection, const char *url, diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h index d90c6bbd4f..4ca9a5c4f1 100644 --- a/src/journal-remote/microhttpd-util.h +++ b/src/journal-remote/microhttpd-util.h @@ -47,6 +47,12 @@ # define MHD_create_response_from_fd_at_offset64 MHD_create_response_from_fd_at_offset #endif +#if MHD_VERSION >= 0x00097002 +# define mhd_result enum MHD_Result +#else +# define mhd_result int +#endif + void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0); /* respond_oom() must be usable with return, hence this form. */ |