diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-01-27 16:12:23 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-01-27 16:12:23 -0800 |
| commit | 4544a9f7b46aab4c7a261f321ffdd35711d62099 (patch) | |
| tree | 9a826463841723544454a02d3e048dbcb4b8c552 /include | |
| parent | 4fb0dba9905b8e2584c159ccd0f9b445227c865d (diff) | |
| parent | c8472186e15ab6968342bae839277b82cf2584c4 (diff) | |
| download | system_core-4544a9f7b46aab4c7a261f321ffdd35711d62099.zip system_core-4544a9f7b46aab4c7a261f321ffdd35711d62099.tar.gz system_core-4544a9f7b46aab4c7a261f321ffdd35711d62099.tar.bz2 | |
resolved conflicts for merge of c8472186 to master
Change-Id: I41acaaa3a5d6aeb6873472f17db4cfa756b2d23f
Diffstat (limited to 'include')
| -rw-r--r-- | include/arch/darwin-x86/AndroidConfig.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/arch/darwin-x86/AndroidConfig.h b/include/arch/darwin-x86/AndroidConfig.h index 1f7545e..3aa0cd1 100644 --- a/include/arch/darwin-x86/AndroidConfig.h +++ b/include/arch/darwin-x86/AndroidConfig.h @@ -146,7 +146,7 @@ */ #if (defined(__ppc__) || defined(__ppc64__)) # define HAVE_BIG_ENDIAN -#elif defined(__i386__) +#elif (defined(__i386__) || defined(__x86_64__)) # define HAVE_LITTLE_ENDIAN #endif @@ -219,7 +219,7 @@ */ #if (defined(__ppc__) || defined(__ppc64__)) # define ARCH_PPC -#elif defined(__i386__) +#elif (defined(__i386__) || defined(__x86_64__)) # define ARCH_X86 #endif |