From aec67a1e4216b38f8ad9518bff4e152641c47af7 Mon Sep 17 00:00:00 2001 From: Turiiya <34311583+ttytm@users.noreply.github.com> Date: Fri, 16 Aug 2024 20:44:33 +0200 Subject: [PATCH] Remove docs for workarounds for resolved thrid-party conflicts The conflicts were addressed in upstram. --- src/civetweb/README.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/civetweb/README.md b/src/civetweb/README.md index 5f7eab532..13b8abd24 100644 --- a/src/civetweb/README.md +++ b/src/civetweb/README.md @@ -14,19 +14,4 @@ Changes currently required when updating the submodule to ensure full direct int + #endif /* Copyright (c) 2013-2024 the Civetweb developers - ``` - - ```diff - + #ifndef NDEBUG - #define malloc DO_NOT_USE_THIS_FUNCTION__USE_mg_malloc - #define calloc DO_NOT_USE_THIS_FUNCTION__USE_mg_calloc - #define realloc DO_NOT_USE_THIS_FUNCTION__USE_mg_realloc - #define free DO_NOT_USE_THIS_FUNCTION__USE_mg_free - #define snprintf DO_NOT_USE_THIS_FUNCTION__USE_mg_snprintf - + #endif - ``` - -- Allow compiling with swift compiler chaning an incompatible structname - - Rename struct `ah` to `auth_header` [civetweb.c#L8715](https://github.com/webui-dev/webui/blob/ea5540c833b3e4ae38cc8dc7d62965a8507a78ee/src/civetweb/civetweb.c#L8715) - In its related code there is also a variable name `auth_header`, make sure to rename it first to prevent conflicts. + ``` \ No newline at end of file