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

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

View File

@@ -67,11 +67,7 @@
#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>

View 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) ({ \
@@ -49,10 +46,8 @@
#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_ */

View File

@@ -58,11 +58,7 @@
#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>

View File

@@ -58,11 +58,7 @@
#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>

View File

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