From 6b73456865926b5279faa68e771c513e969d0a64 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Mon, 8 Aug 2016 12:26:57 +0000 Subject: [PATCH] Remove _isatty from Android.h it is just #defined to isatty anyway, which lldb already knows how to use. llvm-svn: 277997 --- lldb/include/lldb/Host/android/Android.h | 1 - lldb/source/Host/common/File.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lldb/include/lldb/Host/android/Android.h b/lldb/include/lldb/Host/android/Android.h index 8efc1a5..5a2b31b 100644 --- a/lldb/include/lldb/Host/android/Android.h +++ b/lldb/include/lldb/Host/android/Android.h @@ -14,7 +14,6 @@ #include #include -#define _isatty isatty #define SYS_tgkill __NR_tgkill namespace std diff --git a/lldb/source/Host/common/File.cpp b/lldb/source/Host/common/File.cpp index 9d4ab3d..89587a9 100644 --- a/lldb/source/Host/common/File.cpp +++ b/lldb/source/Host/common/File.cpp @@ -1010,7 +1010,7 @@ File::CalculateInteractiveAndTerminal () { m_is_interactive = eLazyBoolNo; m_is_real_terminal = eLazyBoolNo; -#if (defined(_WIN32) || defined(__ANDROID_NDK__)) +#if defined(_WIN32) if (_isatty(fd)) { m_is_interactive = eLazyBoolYes; -- 2.7.4