Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '204b4157b3fdbeea8859c4ad0e29be18d74e6f5f':
  Use _WIN32 rather than HAVE_WINSOCK.
This commit is contained in:
Elliott Hughes
2015-07-30 15:46:55 +00:00
committed by Android Git Automerger
parent 0c152b9e84 204b4157b3
commit d065fd415c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/androidfw/ResourceTypes.cpp
View File

@@ -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) )