diff options
| author | DRC <information@libjpeg-turbo.org> | 2016-10-25 13:13:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-25 13:13:30 +0000 |
| commit | 5c459baaf6cd30e83bfdb137b11e8ba6a64c1cd3 (patch) | |
| tree | fbcd876737c16170c9208edc665c8f17793983cf | |
| parent | d9459810e7e86977d0f3a597a39129f4e29139dc (diff) | |
| parent | 53c89b3c9826ed4a0e848e0005dc34d8ef7fa474 (diff) | |
| download | platform_external_libjpeg-turbo-5c459baaf6cd30e83bfdb137b11e8ba6a64c1cd3.tar.gz platform_external_libjpeg-turbo-5c459baaf6cd30e83bfdb137b11e8ba6a64c1cd3.tar.bz2 platform_external_libjpeg-turbo-5c459baaf6cd30e83bfdb137b11e8ba6a64c1cd3.zip | |
Fix broken build with NDK platforms < android-21 am: c8d146cb3e am: 741055ca55
am: 53c89b3c98
Change-Id: I37e7a7a5604b5e2b47aa3447fea9c02952b53af4
| -rw-r--r-- | README.android | 6 | ||||
| -rw-r--r-- | jmemmgr.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/README.android b/README.android index 7914001b..d7140fe2 100644 --- a/README.android +++ b/README.android @@ -23,3 +23,9 @@ It is unclear why the unmodified code from upstream appends an underscore to name. Before removing the underscore, the code failed to link because the function names in the SIMD code did not match the callers (because of the extra underscore). + +(3) jmemmgr.c + +Fix broken build with NDK platforms < android-21 +Cherry picked from upstream: +https://github.com/libjpeg-turbo/libjpeg-turbo/commit/dfefba77520ded5c5fd4864e76352a5f3eb23e74
\ No newline at end of file @@ -33,6 +33,7 @@ #include "jpeglib.h" #include "jmemsys.h" /* import the system-dependent declarations */ #include <stdint.h> +#include <limits.h> #ifndef NO_GETENV #ifndef HAVE_STDLIB_H /* <stdlib.h> should declare getenv() */ |