mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use system zlib on Android, too

Browse Source
This commit is contained in:
Tor Lillqvist
2011-06-10 00:05:57 +03:00
parent db280c82e6
commit 3fafb2f3ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libpng/libpng-1.5.1.patch
View File

@@ -238,10 +238,10 @@
* data in PNG files. * data in PNG files.
*/ */
+/* WTF, surely this should depend explicitly on whether using the system or +/* WTF, surely this should depend explicitly on whether using the system or
+ * internal zlib, not on OS... But yeah, so maybe MacOSX (and iOS) are the only OSes for which + * internal zlib, not on OS... But yeah, so maybe MacOSX, iOS and Android are the only OSes for which
+ * we use a system zlib but internal libpng, at least by default. + * we use a system zlib but internal libpng, at least by default.
+ */ + */
+#if defined MACOSX || defined IOS +#if defined MACOSX || defined IOS || defined ANDROID
#include "zlib.h" #include "zlib.h"
+#else +#else
+#include <external/zlib/zlib.h> +#include <external/zlib/zlib.h>
@@ -255,7 +255,7 @@
* of files at once by typing "pngtest -m file1.png file2.png ..." * of files at once by typing "pngtest -m file1.png file2.png ..."
*/ */
+#if defined MACOSX || defined IOS +#if defined MACOSX || defined IOS || defined ANDROID
#include "zlib.h" #include "zlib.h"
+#else +#else
+#include <external/zlib/zlib.h> +#include <external/zlib/zlib.h>
@@ -271,7 +271,7 @@
#endif #endif
-#include "zlib.h" /* For crc32 */ -#include "zlib.h" /* For crc32 */
+#if defined MACOSX || defined IOS +#if defined MACOSX || defined IOS || defined ANDROID
+#include "zlib.h" +#include "zlib.h"
+#else +#else
+#include <external/zlib/zlib.h> +#include <external/zlib/zlib.h>