am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."

* commit '08e2fd7238c50b5d06af41bc944ee08acb023d51':
  We HAVE_LITTLE_ENDIAN.
This commit is contained in:
Elliott Hughes
2014-11-22 07:56:46 +00:00
committed by Android Git Automerger

View File

@ -47,18 +47,10 @@ namespace android {
#ifdef HAVE_WINSOCK
#undef nhtol
#undef htonl
#ifdef HAVE_LITTLE_ENDIAN
#define ntohl(x) ( ((x) << 24) | (((x) >> 24) & 255) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) )
#define htonl(x) ntohl(x)
#define ntohs(x) ( (((x) << 8) & 0xff00) | (((x) >> 8) & 255) )
#define htons(x) ntohs(x)
#else
#define ntohl(x) (x)
#define htonl(x) (x)
#define ntohs(x) (x)
#define htons(x) (x)
#endif
#endif
#define IDMAP_MAGIC 0x504D4449