diff options
| author | Martin Storsjo <martin@martin.st> | 2015-03-03 10:52:42 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2015-03-03 10:52:42 +0200 |
| commit | d7fca408b48bbff22d186c42c75c9fe7a79b4515 (patch) | |
| tree | 0ae0bd9722aa4433179fa9e4f0d51c4b2782b0c7 /libSYS/src/genericStds.cpp | |
| parent | 97b382cd3f38e8b6082a9e4a37e701f02158d756 (diff) | |
| parent | 2b6bf8dc0941f3a4531030b950cf24fd31248b0b (diff) | |
| download | fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.tar.gz fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.tar.bz2 fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libSYS/src/genericStds.cpp')
| -rw-r--r-- | libSYS/src/genericStds.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libSYS/src/genericStds.cpp b/libSYS/src/genericStds.cpp index d0b4a90..f405483 100644 --- a/libSYS/src/genericStds.cpp +++ b/libSYS/src/genericStds.cpp @@ -116,7 +116,7 @@ amm-info@iis.fraunhofer.de /* Include OS/System specific implementations. */ -#if defined(__linux__) /* cppp replaced: elif */ +#if defined(__linux__) && !defined(__ANDROID__) /* cppp replaced: elif */ #include "linux/genericStds_linux.cpp" #endif |