shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-20 14:03:39 +03:00
Code

Fix build with µhttpd 0.9.71

Browse Source 
The return type of callbacks was changed from int to an enum.

(cherry picked from commit d17eabb1052e7c8c432331a7a782845e36164f01)
(cherry picked from commit a91ed646aa698ff530770c836c174fb7b3a5e799)
(cherry picked from commit 7bc54463ced882ac31fd42b2e34a9e764330a31a)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-06-30 09:56:10 +02:00
parent b9a0681303
commit 3120ad895b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/journal-remote/journal-gatewayd.c
View File

@ -351,7 +351,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,
@ -798,7 +798,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,

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

@ -252,7 +252,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,

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

@ -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. */