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

Commit 204b4157 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK." 

* commit 'f8a6a2f6':
  Use _WIN32 rather than HAVE_WINSOCK.
parents e528f048 f8a6a2f6

libs/androidfw/ResourceTypes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 


namespace android {



#ifdef HAVE_WINSOCK

#if defined(_WIN32)

#undef  nhtol

#undef  htonl

#define ntohl(x)    ( ((x) << 24) | (((x) >> 24) & 255) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) )