diff options
| author | 2015-07-30 15:32:51 +0000 | |
|---|---|---|
| committer | 2015-07-30 15:32:51 +0000 | |
| commit | 204b4157b3fdbeea8859c4ad0e29be18d74e6f5f (patch) | |
| tree | 02d5219d39c17ae51a15911b75d17315fc90be3f | |
| parent | e528f048689868a2d4dfdf23b553fe536acd15cd (diff) | |
| parent | f8a6a2f602ad4ec049b2d2d4741571a76c3d014b (diff) | |
am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit 'f8a6a2f602ad4ec049b2d2d4741571a76c3d014b':
Use _WIN32 rather than HAVE_WINSOCK.
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index fbe08ec11c43..83638104de54 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -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) ) |