diff options
author | Zachary Turner <zturner@google.com> | 2014-11-17 21:31:18 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2014-11-17 21:31:18 +0000 |
commit | d553d00c79eb250a10cd3ad8b45103ff0be0c9ee (patch) | |
tree | ef7762253257804f7d87712c3951cb902df93662 /lldb/source/Core/IOHandler.cpp | |
parent | 05d77c8b717877df69295fd70abf77ca021330ac (diff) | |
download | bcm5719-llvm-d553d00c79eb250a10cd3ad8b45103ff0be0c9ee.tar.gz bcm5719-llvm-d553d00c79eb250a10cd3ad8b45103ff0be0c9ee.zip |
Disable Editline on Windows.
Editline does not work correctly on Windows. This goes back at
least to r208369, and as a result r210105 was submitted to disable
libedit at runtime on Windows.
More recently, r222163 was submitted which re-writes editline
entirely, but makes the situation even worse on Windows, to the
point that it doesn't even compile. While it would be easy to
fix the compilation failure, this patch simply stops compiling
Editline entirely on Windows, as the simple compilation fix would
still result in a broken use of select on Windows, and as such a
broken implementation of Editline.
Since Editline was already disabled to begin with on Windows, we
don't attempt to fix the compilation failure or the underlying
issues, and instead just disable it "even more".
llvm-svn: 222177
Diffstat (limited to 'lldb/source/Core/IOHandler.cpp')
-rw-r--r-- | lldb/source/Core/IOHandler.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lldb/source/Core/IOHandler.cpp b/lldb/source/Core/IOHandler.cpp index bf3815bf1bb..21ba965ba21 100644 --- a/lldb/source/Core/IOHandler.cpp +++ b/lldb/source/Core/IOHandler.cpp @@ -387,12 +387,7 @@ IOHandlerEditline::IOHandlerEditline (Debugger &debugger, #ifndef LLDB_DISABLE_LIBEDIT bool use_editline = false; -#ifndef _MSC_VER use_editline = m_input_sp->GetFile().GetIsRealTerminal(); -#else - // Editline is causing issues on Windows, so use the fallback. - use_editline = false; -#endif if (use_editline) { @@ -620,9 +615,11 @@ IOHandlerEditline::SetContinuationPrompt (const char *p) m_continuation_prompt = p; else m_continuation_prompt.clear(); - + +#ifndef LLDB_DISABLE_LIBEDIT if (m_editline_ap) m_editline_ap->SetContinuationPrompt (m_continuation_prompt.empty() ? NULL : m_continuation_prompt.c_str()); +#endif } @@ -635,7 +632,7 @@ IOHandlerEditline::SetBaseLineNumber (uint32_t line) uint32_t IOHandlerEditline::GetCurrentLineIndex () const { -#ifdef LLDB_DISABLE_LIBEDIT +#ifndef LLDB_DISABLE_LIBEDIT if (m_editline_ap) return m_editline_ap->GetCurrentLine(); #endif |