| commit | b2babfd3b46d468621c82f99599489c03f9e1457 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Mon Nov 02 19:06:03 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 02 19:06:03 2015 +0000 |
| tree | a8fcf6c3f2467277a945b913c560a1d1331f1b00 | |
| parent | d56c3c5bc82fa647cd75cf0a188c5ab77fe2f3ce [diff] | |
| parent | dc6f0cd0333456b44855783b124ff2b1f93bf16e [diff] |
Merge "adb: use correct _WIN32 macro." am: 5c75b529f6 am: dcaf6932fd am: ae52bfb752 * commit 'ae52bfb75248618609ad9dff836ca6c38f64f676': 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);