diff options
| author | Dima Zavin <dmitriyz@google.com> | 2010-05-20 00:31:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-20 00:31:18 -0700 |
| commit | 2bdcf63c4cefac4711336156481973d56362aa15 (patch) | |
| tree | d89b336918cfa0ecae34597b9071e68b6f1e7e90 /include | |
| parent | a92be64809e3927790c7a8535f548ab5a9105e45 (diff) | |
| parent | 165db2a19888673548a1a7bd1ffd39e89a8dfe78 (diff) | |
| download | system_core-2bdcf63c4cefac4711336156481973d56362aa15.zip system_core-2bdcf63c4cefac4711336156481973d56362aa15.tar.gz system_core-2bdcf63c4cefac4711336156481973d56362aa15.tar.bz2 | |
Merge "Don't define __linux__ if it is already defined by the toolchain. This change does not affect existing behavior at all and makes the file compatible with new toolchain."
Diffstat (limited to 'include')
| -rw-r--r-- | include/arch/linux-arm/AndroidConfig.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/arch/linux-arm/AndroidConfig.h b/include/arch/linux-arm/AndroidConfig.h index f51ddb1..81f077f 100644 --- a/include/arch/linux-arm/AndroidConfig.h +++ b/include/arch/linux-arm/AndroidConfig.h @@ -199,7 +199,9 @@ /* * Add any extra platform-specific defines here. */ +#ifndef __linux__ #define __linux__ +#endif /* * Define if we have <malloc.h> header |