diff options
| author | Elliott Hughes <enh@google.com> | 2015-07-29 17:45:24 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-07-29 17:45:24 -0700 |
| commit | adbf442a515c51cb2acb34e20c1d2ea0e843c660 (patch) | |
| tree | 11511aa802e506ae1bfe663e46493d0f04951b40 /adb/fdevent.cpp | |
| parent | a6597598a0b82759960df09fd173192ca8c82f0c (diff) | |
| download | system_core-adbf442a515c51cb2acb34e20c1d2ea0e843c660.tar.gz system_core-adbf442a515c51cb2acb34e20c1d2ea0e843c660.tar.bz2 system_core-adbf442a515c51cb2acb34e20c1d2ea0e843c660.zip | |
Use _WIN32 rather than HAVE_WINSOCK.
Change-Id: I9855b6fe72e2f2f3a8360c0993a67cb988024ee4
Diffstat (limited to 'adb/fdevent.cpp')
| -rw-r--r-- | adb/fdevent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/fdevent.cpp b/adb/fdevent.cpp index 5cd498831..a8abade78 100644 --- a/adb/fdevent.cpp +++ b/adb/fdevent.cpp @@ -234,7 +234,7 @@ static void fdevent_process() #else /* USE_SELECT */ -#ifdef HAVE_WINSOCK +#if defined(_WIN32) #include <winsock2.h> #else #include <sys/select.h> @@ -617,7 +617,7 @@ void fdevent_install(fdevent *fde, int fd, fd_func func, void *arg) fde->func = func; fde->arg = arg; -#ifndef HAVE_WINSOCK +#if !defined(_WIN32) fcntl(fd, F_SETFL, O_NONBLOCK); #endif fdevent_register(fde); |