commit 97657b10c7d93a1b7877ac75c276b70fa4264928
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 19 00:17:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 19 00:17:22 2019 +0000
tree 77835d5721e51c9f8c2cb5718b4404efeeb6e4d7
parent a6bfcefc8a6d7ea1bd2b60f9e3bbeba6ea5cdc33
parent 79b73612f64f95f29650fca3c5dff4a0e6fd7260

Merge "<android-base/endian.h>: fix interoperability issue"

base/include/android-base/endian.h

diff --git a/base/include/android-base/endian.h b/base/include/android-base/endian.h
index 2d0f614..8fa6365 100644
--- a/base/include/android-base/endian.h
+++ b/base/include/android-base/endian.h
@@ -51,8 +51,10 @@
 /* macOS has some of the basics. */
 #include <sys/_endian.h>
 #else
-/* Windows has even less. */
+/* Windows has some of the basics as well. */
 #include <sys/param.h>
+#include <winsock2.h>
+/* winsock2.h *must* be included before the following four macros. */
 #define htons(x) __builtin_bswap16(x)
 #define htonl(x) __builtin_bswap32(x)
 #define ntohs(x) __builtin_bswap16(x)