am d77c1ec9: Merge "Bring our <machine/endian.h> files back in sync."

* commit 'd77c1ec90a17ac91c24904670ba9a3a60fe4cd3d':
  Bring our <machine/endian.h> files back in sync.
This commit is contained in:
Elliott Hughes
2014-11-22 02:44:26 +00:00
committed by Android Git Automerger
5 changed files with 3 additions and 19 deletions

View File

@@ -67,11 +67,7 @@
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#if defined(__ARMEB__)
#define _BYTE_ORDER _BIG_ENDIAN
#else
#define _BYTE_ORDER _LITTLE_ENDIAN #define _BYTE_ORDER _LITTLE_ENDIAN
#endif
#define __STRICT_ALIGNMENT #define __STRICT_ALIGNMENT
#include <sys/types.h> #include <sys/types.h>
#include <sys/endian.h> #include <sys/endian.h>

View File

@@ -29,9 +29,6 @@
#ifndef _AARCH64_ENDIAN_H_ #ifndef _AARCH64_ENDIAN_H_
#define _AARCH64_ENDIAN_H_ #define _AARCH64_ENDIAN_H_
#include <sys/types.h>
#include <sys/endian.h>
#ifdef __GNUC__ #ifdef __GNUC__
#define __swap16md(x) ({ \ #define __swap16md(x) ({ \
@@ -49,10 +46,8 @@
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#if defined(__AARCH64EB__)
#define _BYTE_ORDER _BIG_ENDIAN
#else
#define _BYTE_ORDER _LITTLE_ENDIAN #define _BYTE_ORDER _LITTLE_ENDIAN
#endif #include <sys/types.h>
#include <sys/endian.h>
#endif /* _AARCH64_ENDIAN_H_ */ #endif /* _AARCH64_ENDIAN_H_ */

View File

@@ -58,11 +58,7 @@
#endif /* __mips32r2__ */ #endif /* __mips32r2__ */
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#if defined(__MIPSEB__)
#define _BYTE_ORDER _BIG_ENDIAN
#else
#define _BYTE_ORDER _LITTLE_ENDIAN #define _BYTE_ORDER _LITTLE_ENDIAN
#endif
#define __STRICT_ALIGNMENT #define __STRICT_ALIGNMENT
#include <sys/types.h> #include <sys/types.h>
#include <sys/endian.h> #include <sys/endian.h>

View File

@@ -58,11 +58,7 @@
#endif /* __mips32r2__ */ #endif /* __mips32r2__ */
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#if defined(__MIPSEB__)
#define _BYTE_ORDER _BIG_ENDIAN
#else
#define _BYTE_ORDER _LITTLE_ENDIAN #define _BYTE_ORDER _LITTLE_ENDIAN
#endif
#define __STRICT_ALIGNMENT #define __STRICT_ALIGNMENT
#include <sys/types.h> #include <sys/types.h>
#include <sys/endian.h> #include <sys/endian.h>

View File

@@ -56,6 +56,7 @@
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#define _BYTE_ORDER _LITTLE_ENDIAN #define _BYTE_ORDER _LITTLE_ENDIAN
#include <sys/types.h>
#include <sys/endian.h> #include <sys/endian.h>
#endif /* _MACHINE_ENDIAN_H_ */ #endif /* _MACHINE_ENDIAN_H_ */