Bring our <machine/endian.h> files back in sync.
authorElliott Hughes <enh@google.com>
Sat, 22 Nov 2014 02:34:36 +0000 (18:34 -0800)
committerElliott Hughes <enh@google.com>
Sat, 22 Nov 2014 02:34:36 +0000 (18:34 -0800)
They'd drifted slightly which led to a compilation error in toybox,
which was assuming pid_t was defined. arm and arm64 were picking it
up via <endian.h> but x86 wasn't.

Change-Id: I58401e6c0066959dfc3b305b020876aaf7074bbf

libc/arch-arm/include/machine/endian.h
libc/arch-arm64/include/machine/endian.h
libc/arch-mips/include/machine/endian.h
libc/arch-mips64/include/machine/endian.h
libc/arch-x86_64/include/machine/endian.h

index 8d9723d7a85c0aa075c5501078b2ce3051c91d72..04bba20dc8c1be59a86d40b4a48acc9fe083a309 100644 (file)
 
 #endif  /* __GNUC__ */
 
-#if defined(__ARMEB__)
-#define _BYTE_ORDER _BIG_ENDIAN
-#else
 #define _BYTE_ORDER _LITTLE_ENDIAN
-#endif
 #define __STRICT_ALIGNMENT
 #include <sys/types.h>
 #include <sys/endian.h>
index 87a038d0e4eba7e66512a8f40b3142fe33ff2c77..4743733633b4eb4aa362feca995da83d14e95b7f 100644 (file)
@@ -29,9 +29,6 @@
 #ifndef _AARCH64_ENDIAN_H_
 #define _AARCH64_ENDIAN_H_
 
-#include <sys/types.h>
-#include <sys/endian.h>
-
 #ifdef __GNUC__
 
 #define __swap16md(x) ({                                        \
 
 #endif  /* __GNUC__ */
 
-#if defined(__AARCH64EB__)
-#define _BYTE_ORDER _BIG_ENDIAN
-#else
 #define _BYTE_ORDER _LITTLE_ENDIAN
-#endif
+#include <sys/types.h>
+#include <sys/endian.h>
 
 #endif /* _AARCH64_ENDIAN_H_ */
index 41a9004f40a33d8f45e2620c659365e72b7e112f..9270e9d9fc616f7901ef3b54b0f9a03a219674fb 100644 (file)
 #endif  /* __mips32r2__ */
 #endif  /* __GNUC__ */
 
-#if defined(__MIPSEB__)
-#define _BYTE_ORDER _BIG_ENDIAN
-#else
 #define _BYTE_ORDER _LITTLE_ENDIAN
-#endif
 #define __STRICT_ALIGNMENT
 #include <sys/types.h>
 #include <sys/endian.h>
index 41a9004f40a33d8f45e2620c659365e72b7e112f..9270e9d9fc616f7901ef3b54b0f9a03a219674fb 100644 (file)
 #endif  /* __mips32r2__ */
 #endif  /* __GNUC__ */
 
-#if defined(__MIPSEB__)
-#define _BYTE_ORDER _BIG_ENDIAN
-#else
 #define _BYTE_ORDER _LITTLE_ENDIAN
-#endif
 #define __STRICT_ALIGNMENT
 #include <sys/types.h>
 #include <sys/endian.h>
index 7889a374f4708d532fe9c9f605f84ad848474679..8a3b0c583fa18e8f22a21c0dcb24e1b92e36ce8e 100644 (file)
@@ -56,6 +56,7 @@
 #endif /* __GNUC__ */
 
 #define _BYTE_ORDER _LITTLE_ENDIAN
+#include <sys/types.h>
 #include <sys/endian.h>
 
 #endif /* _MACHINE_ENDIAN_H_ */