aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJing Yu <jingyu@google.com>2010-05-18 10:55:52 -0700
committerJing Yu <jingyu@google.com>2010-05-18 10:55:52 -0700
commit165db2a19888673548a1a7bd1ffd39e89a8dfe78 (patch)
tree7471419379d023f952b35994bf95997103282f92 /include
parenteb31c0bdc0eac0898f01cdc1737cea94269f8f27 (diff)
downloadsystem_core-165db2a19888673548a1a7bd1ffd39e89a8dfe78.tar.gz
system_core-165db2a19888673548a1a7bd1ffd39e89a8dfe78.tar.bz2
system_core-165db2a19888673548a1a7bd1ffd39e89a8dfe78.zip
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. Change-Id: Ia33bb9372d1705ec538b414bf69773f093e4543c
Diffstat (limited to 'include')
-rw-r--r--include/arch/linux-arm/AndroidConfig.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/arch/linux-arm/AndroidConfig.h b/include/arch/linux-arm/AndroidConfig.h
index f51ddb1c..81f077f4 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