summaryrefslogtreecommitdiff
path: root/include/utils
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-07-30 15:17:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-30 15:17:07 +0000
commitc6dbc85845e58464541bb0644ebd570c44841a4c (patch)
tree12b577b1f5d2e24e431f2f2545ee4d0dd92a03c2 /include/utils
parent6b802c4b9565c83a863c88416e6b7e5c3d418aeb (diff)
parent42dbc4b1859fe4de16b19e9b74324b345c5fcb9d (diff)
am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '42dbc4b1859fe4de16b19e9b74324b345c5fcb9d': Use _WIN32 rather than HAVE_WINSOCK.
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/ByteOrder.h2
-rw-r--r--include/utils/FileMap.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/utils/ByteOrder.h b/include/utils/ByteOrder.h
index baa3a83dd..44ea13df8 100644
--- a/include/utils/ByteOrder.h
+++ b/include/utils/ByteOrder.h
@@ -21,7 +21,7 @@
#include <stdint.h>
#include <sys/types.h>
-#ifdef HAVE_WINSOCK
+#if defined(_WIN32)
#include <winsock2.h>
#else
#include <netinet/in.h>
diff --git a/include/utils/FileMap.h b/include/utils/FileMap.h
index f70fc927e..afd7bfd7b 100644
--- a/include/utils/FileMap.h
+++ b/include/utils/FileMap.h
@@ -26,7 +26,7 @@
#if defined(__MINGW32__)
// Ensure that we always pull in winsock2.h before windows.h
-#ifdef HAVE_WINSOCK
+#if defined(_WIN32)
#include <winsock2.h>
#endif
#include <windows.h>