Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4544a9f7 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of c8472186 to master 

Change-Id: I41acaaa3a5d6aeb6873472f17db4cfa756b2d23f
parents 4fb0dba9 c8472186

include/arch/darwin-x86/AndroidConfig.h

+2 −2
Original line number Diff line number Diff line
@@ -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