am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32."

* commit '9d748c8bf4b3b4810c6ad9dcc75322c8059c3876':
  Replace HAVE_WIN32_IPC with _WIN32.
This commit is contained in:
Elliott Hughes 2015-07-09 17:51:06 +00:00 committed by Android Git Automerger
commit d15baf0180
1 changed files with 1 additions and 1 deletions

View File

@ -118,7 +118,7 @@ static int local_name_to_fd(const char* name) {
return socket_loopback_server(port, SOCK_STREAM);
}
}
#ifndef HAVE_WIN32_IPC /* no Unix-domain sockets on Win32 */
#if !defined(_WIN32) // No Unix-domain sockets on Windows.
// It's nonsensical to support the "reserved" space on the adb host side
if (!strncmp(name, "local:", 6)) {
return socket_local_server(name + 6, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);