| commit | dc6f0cd0333456b44855783b124ff2b1f93bf16e | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Mon Nov 02 19:01:53 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 02 19:01:53 2015 +0000 |
| tree | edca52c236ab8aa9e75e3cbc661ae2dbc2532677 | |
| parent | 805145993e546e03ec7844b2ed5cb465055639a4 [diff] | |
| parent | 21394c65c3fcaf4ca11cee990f6c68068303fdb2 [diff] |
Merge "adb: use correct _WIN32 macro." am: 5c75b529f6 am: dcaf6932fd * commit 'dcaf6932fde9df11f415f683589f962858084cb1': 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);