| commit | 21394c65c3fcaf4ca11cee990f6c68068303fdb2 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Mon Nov 02 18:59:01 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 02 18:59:01 2015 +0000 |
| tree | b6fefed371d6ae637cc2f10e08b2367666483dda | |
| parent | 64d4efc16d4d48be46c3de104d1bf597847f46b2 [diff] | |
| parent | 7569859434fbe4dba23e75a754b42f6c6c0bea0a [diff] |
Merge "adb: use correct _WIN32 macro." am: 5c75b529f6 * commit '5c75b529f684b388c91c7e7d0b2c7fece376ac1d': adb: use correct _WIN32 macro.
diff --git a/adb/commandline.cpp b/adb/commandline.cpp index db05f05..d5a0fc0 100644 --- a/adb/commandline.cpp +++ b/adb/commandline.cpp
@@ -439,7 +439,7 @@ adb_thread_setname("stdin reader"); -#ifndef __WIN32 +#ifndef _WIN32 // Mask SIGTTIN in case we're in a backgrounded process sigset_t sigset; sigemptyset(&sigset);