Skip to content

Commit

Permalink
Merge pull request #473 from ttytm/docs/remove-resolved-workarounds
Browse files Browse the repository at this point in the history
Remove docs for workarounds for resolved thrid-party conflicts
  • Loading branch information
neroist authored Aug 23, 2024
2 parents e8aaba6 + aec67a1 commit ead9970
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions src/civetweb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
```

0 comments on commit ead9970

Please sign in to comment.