|
 |
b11b5f |
From ca86de228e19cea268ec3eeabc9097d7c28fbf24 Mon Sep 17 00:00:00 2001
|
|
|
b11b5f |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
b11b5f |
Date: Tue, 30 Jun 2020 09:56:10 +0200
|
|
|
b11b5f |
Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20=C2=B5httpd=200.9.71?=
|
|
|
b11b5f |
MIME-Version: 1.0
|
|
|
b11b5f |
Content-Type: text/plain; charset=UTF-8
|
|
|
b11b5f |
Content-Transfer-Encoding: 8bit
|
|
|
b11b5f |
|
|
|
b11b5f |
The return type of callbacks was changed from int to an enum.
|
|
|
b11b5f |
|
|
|
b11b5f |
(cherry picked from commit d17eabb1052e7c8c432331a7a782845e36164f01)
|
|
|
b11b5f |
|
|
|
b11b5f |
Related: #2122499
|
|
|
b11b5f |
---
|
|
|
b11b5f |
src/journal-remote/journal-gatewayd.c | 4 ++--
|
|
|
b11b5f |
src/journal-remote/journal-remote-main.c | 2 +-
|
|
|
b11b5f |
src/journal-remote/microhttpd-util.h | 6 ++++++
|
|
|
b11b5f |
3 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
b11b5f |
|
|
|
b11b5f |
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
|
|
|
b11b5f |
index 54446ff7b5..3ff05a4d72 100644
|
|
|
b11b5f |
--- a/src/journal-remote/journal-gatewayd.c
|
|
|
b11b5f |
+++ b/src/journal-remote/journal-gatewayd.c
|
|
|
b11b5f |
@@ -338,7 +338,7 @@ static int request_parse_range(
|
|
|
b11b5f |
return 0;
|
|
|
b11b5f |
}
|
|
|
b11b5f |
|
|
|
b11b5f |
-static int request_parse_arguments_iterator(
|
|
|
b11b5f |
+static mhd_result request_parse_arguments_iterator(
|
|
|
b11b5f |
void *cls,
|
|
|
b11b5f |
enum MHD_ValueKind kind,
|
|
|
b11b5f |
const char *key,
|
|
|
b11b5f |
@@ -795,7 +795,7 @@ static int request_handler_machine(
|
|
|
b11b5f |
return MHD_queue_response(connection, MHD_HTTP_OK, response);
|
|
|
b11b5f |
}
|
|
|
b11b5f |
|
|
|
b11b5f |
-static int request_handler(
|
|
|
b11b5f |
+static mhd_result request_handler(
|
|
|
b11b5f |
void *cls,
|
|
|
b11b5f |
struct MHD_Connection *connection,
|
|
|
b11b5f |
const char *url,
|
|
|
b11b5f |
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
|
|
|
b11b5f |
index bcaa370099..a1008db6eb 100644
|
|
|
b11b5f |
--- a/src/journal-remote/journal-remote-main.c
|
|
|
b11b5f |
+++ b/src/journal-remote/journal-remote-main.c
|
|
|
b11b5f |
@@ -241,7 +241,7 @@ static int process_http_upload(
|
|
|
b11b5f |
return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK.");
|
|
|
b11b5f |
};
|
|
|
b11b5f |
|
|
|
b11b5f |
-static int request_handler(
|
|
|
b11b5f |
+static mhd_result request_handler(
|
|
|
b11b5f |
void *cls,
|
|
|
b11b5f |
struct MHD_Connection *connection,
|
|
|
b11b5f |
const char *url,
|
|
|
b11b5f |
diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h
|
|
|
b11b5f |
index dd0ca1d9bd..792c07ac20 100644
|
|
|
b11b5f |
--- a/src/journal-remote/microhttpd-util.h
|
|
|
b11b5f |
+++ b/src/journal-remote/microhttpd-util.h
|
|
|
b11b5f |
@@ -51,6 +51,12 @@
|
|
|
b11b5f |
# define MHD_create_response_from_fd_at_offset64 MHD_create_response_from_fd_at_offset
|
|
|
b11b5f |
#endif
|
|
|
b11b5f |
|
|
|
b11b5f |
+#if MHD_VERSION >= 0x00097002
|
|
|
b11b5f |
+# define mhd_result enum MHD_Result
|
|
|
b11b5f |
+#else
|
|
|
b11b5f |
+# define mhd_result int
|
|
|
b11b5f |
+#endif
|
|
|
b11b5f |
+
|
|
|
b11b5f |
void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
|
|
|
b11b5f |
|
|
|
b11b5f |
/* respond_oom() must be usable with return, hence this form. */
|