[local] use MHD_Result type with microhttpd >= 0.9.71,

fixes build warning with recent microhttpd versions. code as in https://github.com/xbmc/xbmc/blob/51fa35f2d3b100bfa04143e2efc9bef46679fb8d/xbmc/network/httprequesthandler/IHTTPRequestHandler.h#L25
volkszaehler · Mar 30, 2021 · d4a0c9b · d4a0c9b
1 parent fddf479
commit d4a0c9b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/include/local.h b/include/local.h
@@ -32,9 +32,15 @@
 
 #include <microhttpd.h>
 
-int handle_request(void *cls, struct MHD_Connection *connection, const char *url,
-				   const char *method, const char *version, const char *upload_data,
-				   size_t *upload_data_size, void **con_cls);
+#if MHD_VERSION >= 0x00097002
+using MHD_RESULT = MHD_Result;
+#else
+using MHD_RESULT = int;
+#endif
+
+MHD_RESULT handle_request(void *cls, struct MHD_Connection *connection, const char *url,
+						  const char *method, const char *version, const char *upload_data,
+						  size_t *upload_data_size, void **con_cls);
 
 class Channel;
 void shrink_localbuffer(); // remove old data in the local buffer

diff --git a/src/local.cpp b/src/local.cpp
@@ -124,11 +124,11 @@ json_object *api_json_tuples(const char *uuid) {
 	return json_tuples;
 }
 
-int handle_request(void *cls, struct MHD_Connection *connection, const char *url,
-				   const char *method, const char *version, const char *upload_data,
-				   size_t *upload_data_size, void **con_cls) {
+MHD_RESULT handle_request(void *cls, struct MHD_Connection *connection, const char *url,
+						  const char *method, const char *version, const char *upload_data,
+						  size_t *upload_data_size, void **con_cls) {
 
-	int status;
+	MHD_RESULT status;
 	int response_code = MHD_HTTP_NOT_FOUND;
 
 	// mapping between meters and channels