OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
84a04d5
)
Use _WIN32 rather than HAVE_WINSOCK.
author
Elliott Hughes
<enh@google.com>
Thu, 30 Jul 2015 00:49:27 +0000
(17:49 -0700)
committer
Elliott Hughes
<enh@google.com>
Thu, 30 Jul 2015 00:49:27 +0000
(17:49 -0700)
Change-Id: I0821d2af8473c359e8b73aec455000cb7c42f690
libs/androidfw/ResourceTypes.cpp
patch
|
blob
|
history
diff --git
a/libs/androidfw/ResourceTypes.cpp
b/libs/androidfw/ResourceTypes.cpp
index
fbe08ec
..
8363810
100644
(file)
--- a/
libs/androidfw/ResourceTypes.cpp
+++ b/
libs/androidfw/ResourceTypes.cpp
@@
-47,7
+47,7
@@
namespace android {
-#if
def HAVE_WINSOCK
+#if
defined(_WIN32)
#undef nhtol
#undef htonl
#define ntohl(x) ( ((x) << 24) | (((x) >> 24) & 255) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) )