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

Commit 08e2fd72 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 

* commit 'ff4dd15c':
  We HAVE_LITTLE_ENDIAN.
parents 50884b5b ff4dd15c

libs/androidfw/ResourceTypes.cpp

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