commit 4544a9f7b46aab4c7a261f321ffdd35711d62099
author Jean-Baptiste Queru <jbq@google.com> Wed Jan 27 16:12:23 2010 -0800
committer Jean-Baptiste Queru <jbq@google.com> Wed Jan 27 16:12:23 2010 -0800
tree 9a826463841723544454a02d3e048dbcb4b8c552
parent 4fb0dba9905b8e2584c159ccd0f9b445227c865d
parent c8472186e15ab6968342bae839277b82cf2584c4

resolved conflicts for merge of c8472186 to master

Change-Id: I41acaaa3a5d6aeb6873472f17db4cfa756b2d23f

include/arch/darwin-x86/AndroidConfig.h

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