From 205afe679855a4ce8149cdaa94d3f0868ce796dc Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 6 Feb 2015 21:38:51 +0000 Subject: Import LLDB as of upstream SVN r225923 (git 2b588ecd) This corresponds with the branchpoint for the 3.6 release. A number of files not required for the FreeBSD build have been removed. Sponsored by: DARPA, AFRL --- source/Utility/PseudoTerminal.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/Utility/PseudoTerminal.cpp') diff --git a/source/Utility/PseudoTerminal.cpp b/source/Utility/PseudoTerminal.cpp index c906ea273005..e90955d37d4c 100644 --- a/source/Utility/PseudoTerminal.cpp +++ b/source/Utility/PseudoTerminal.cpp @@ -31,6 +31,8 @@ char *ptsname(int fd) { return 0; } pid_t fork(void) { return 0; } pid_t setsid(void) { return 0; } +#elif defined(__ANDROID_NDK__) +#include "lldb/Host/android/Android.h" #endif using namespace lldb_utility; @@ -66,7 +68,11 @@ PseudoTerminal::CloseMasterFileDescriptor () { if (m_master_fd >= 0) { + // Don't call 'close' on m_master_fd for Windows as a dummy implementation of + // posix_openpt above always gives it a 0 value. +#ifndef _WIN32 ::close (m_master_fd); +#endif m_master_fd = invalid_fd; } } -- cgit v1.2.3