diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-10 00:05:57 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-10 00:05:57 +0300 |
| commit | 3fafb2f3ead5fb533730ce5607e4421cfd85e28a (patch) | |
| tree | 6a7374769e8f9c49910968916521d7a645e25eed /libpng | |
| parent | db280c82e6c2bd809aae83527b6293851f3aedb7 (diff) | |
Use system zlib on Android, too
Diffstat (limited to 'libpng')
| -rw-r--r-- | libpng/libpng-1.5.1.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpng/libpng-1.5.1.patch b/libpng/libpng-1.5.1.patch index b69735efeff8..ebae94ac000a 100644 --- a/libpng/libpng-1.5.1.patch +++ b/libpng/libpng-1.5.1.patch @@ -238,10 +238,10 @@ * data in PNG files. */ +/* 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. + */ -+#if defined MACOSX || defined IOS ++#if defined MACOSX || defined IOS || defined ANDROID #include "zlib.h" +#else +#include <external/zlib/zlib.h> @@ -255,7 +255,7 @@ * 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" +#else +#include <external/zlib/zlib.h> @@ -271,7 +271,7 @@ #endif -#include "zlib.h" /* For crc32 */ -+#if defined MACOSX || defined IOS ++#if defined MACOSX || defined IOS || defined ANDROID +#include "zlib.h" +#else +#include <external/zlib/zlib.h> |