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

adb/fdevent.cpp

diff --git a/adb/fdevent.cpp b/adb/fdevent.cpp
index 5cd4988..a8abade 100644
--- a/adb/fdevent.cpp
+++ b/adb/fdevent.cpp
@@ -234,7 +234,7 @@
 
 #else /* USE_SELECT */
 
-#ifdef HAVE_WINSOCK
+#if defined(_WIN32)
 #include <winsock2.h>
 #else
 #include <sys/select.h>
@@ -617,7 +617,7 @@
     fde->func = func;
     fde->arg = arg;
 
-#ifndef HAVE_WINSOCK
+#if !defined(_WIN32)
     fcntl(fd, F_SETFL, O_NONBLOCK);
 #endif
     fdevent_register(fde);

adb/services.cpp

diff --git a/adb/services.cpp b/adb/services.cpp
index 82efb1c..708ef42 100644
--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -443,7 +443,7 @@
             return -1;
 #endif
         }
-#ifndef HAVE_WINSOCK   /* winsock doesn't implement unix domain sockets */
+#if !defined(_WIN32)   /* winsock doesn't implement unix domain sockets */
     } else if(!strncmp(name, "local:", 6)) {
         ret = socket_local_client(name + 6,
                 ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM);