Skip to content

Commit ead9970

Browse files
authored
Merge pull request #473 from ttytm/docs/remove-resolved-workarounds
Remove docs for workarounds for resolved thrid-party conflicts
2 parents e8aaba6 + aec67a1 commit ead9970

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

src/civetweb/README.md

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,4 @@ Changes currently required when updating the submodule to ensure full direct int
1414
+ #endif
1515

1616
/* Copyright (c) 2013-2024 the Civetweb developers
17-
```
18-
19-
```diff
20-
+ #ifndef NDEBUG
21-
#define malloc DO_NOT_USE_THIS_FUNCTION__USE_mg_malloc
22-
#define calloc DO_NOT_USE_THIS_FUNCTION__USE_mg_calloc
23-
#define realloc DO_NOT_USE_THIS_FUNCTION__USE_mg_realloc
24-
#define free DO_NOT_USE_THIS_FUNCTION__USE_mg_free
25-
#define snprintf DO_NOT_USE_THIS_FUNCTION__USE_mg_snprintf
26-
+ #endif
27-
```
28-
29-
- Allow compiling with swift compiler chaning an incompatible structname
30-
31-
Rename struct `ah` to `auth_header` [civetweb.c#L8715](https://github.com/webui-dev/webui/blob/ea5540c833b3e4ae38cc8dc7d62965a8507a78ee/src/civetweb/civetweb.c#L8715)
32-
In its related code there is also a variable name `auth_header`, make sure to rename it first to prevent conflicts.
17+
```

0 commit comments

Comments
 (0)