commit adbf442a515c51cb2acb34e20c1d2ea0e843c660
author Elliott Hughes <enh@google.com> Wed Jul 29 17:45:24 2015 -0700
committer Elliott Hughes <enh@google.com> Wed Jul 29 17:45:24 2015 -0700
tree 11511aa802e506ae1bfe663e46493d0f04951b40
parent a6597598a0b82759960df09fd173192ca8c82f0c

Use _WIN32 rather than HAVE_WINSOCK.

Change-Id: I9855b6fe72e2f2f3a8360c0993a67cb988024ee4

include/cutils/sockets.h

diff --git a/include/cutils/sockets.h b/include/cutils/sockets.h
index 07d1351..2d3c743 100644
--- a/include/cutils/sockets.h
+++ b/include/cutils/sockets.h
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdbool.h>
 
-#ifdef HAVE_WINSOCK
+#if defined(_WIN32)
 #include <winsock2.h>
 typedef int  socklen_t;
 #else

include/utils/ByteOrder.h

diff --git a/include/utils/ByteOrder.h b/include/utils/ByteOrder.h
index baa3a83..44ea13d 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>

include/utils/FileMap.h

diff --git a/include/utils/FileMap.h b/include/utils/FileMap.h
index f70fc92..afd7bfd 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>