forked from godotengine/godot
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
minizip: Fix compatibility with Gentoo's unique zlib API
Fixes godotengine#10539 in a diplomatic way (as opposed to telling Gentoo users to just change their distro or rebuild zlib from upstream...).
- Loading branch information
Showing
2 changed files
with
43 additions
and
0 deletions.
There are no files selected for viewing
27 changes: 27 additions & 0 deletions
27
thirdparty/minizip/godot-zlib-1.2.4-minizip-unbreak-gentoo.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/thirdparty/minizip/ioapi.h b/thirdparty/minizip/ioapi.h | ||
index f25ab6464..6043d34ce 100644 | ||
--- a/thirdparty/minizip/ioapi.h | ||
+++ b/thirdparty/minizip/ioapi.h | ||
@@ -44,6 +44,22 @@ | ||
#include <stdlib.h> | ||
#include "zlib.h" | ||
|
||
+/* GODOT start */ | ||
+/* Mighty Gentoo saves the day by breaking the API of their zlib.h, | ||
+ * removing this definition of OF(args) for no practical reason | ||
+ * worth breaking compatibility with all projects that embed minizip | ||
+ * while trying not to diverge too much from upstream zlib. | ||
+ * Cf. https://github.com/godotengine/godot/issues/10539 | ||
+ * | ||
+ * "By and large, this is good open source behaviour, and fits with | ||
+ * the gentoo _don't fuck with upstream's releases_ philosophy" | ||
+ * -- Gentoo philosopher | ||
+ */ | ||
+#ifndef OF /* function prototypes */ | ||
+ #define OF(args) args | ||
+#endif | ||
+/* GODOT end */ | ||
+ | ||
#if defined(USE_FILE32API) | ||
#define fopen64 fopen | ||
#define ftello64 ftell |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters