| commit | bd2756a61741cbc7fcab5cc0a86c2099a3b0a3f7 | [log] [tgz] |
|---|---|---|
| author | Rich Geldreich <richgel99@gmail.com> | Tue Mar 30 14:09:15 2021 -0400 |
| committer | GitHub <noreply@github.com> | Tue Mar 30 14:09:15 2021 -0400 |
| tree | c179786095b20a7615b652572e710781235e80d9 | |
| parent | 2fd9aec037f0fbdc967f4db782f62067eb6b5372 [diff] | |
| parent | 5e285fe950ff5e3490f33a55050b069ead03147a [diff] |
Merge pull request #218 from JCash/android-compile-fix Android compile fix
diff --git a/transcoder/basisu_containers.h b/transcoder/basisu_containers.h index acc3a95..5801180 100644 --- a/transcoder/basisu_containers.h +++ b/transcoder/basisu_containers.h
@@ -6,7 +6,7 @@ #include <assert.h> #include <algorithm> -#ifdef __linux__ +#if defined(__linux__) && !defined(ANDROID) // Only for malloc_usable_size() in basisu_containers_impl.h #include <malloc.h> #define HAS_MALLOC_USABLE_SIZE 1