Merge branch 'devel' of github.com:arangodb/arangodb into devel

2015-10-28 14:10:09 +01:00 · 2015-10-28 14:10:09 +01:00 · 929835c7e4
parent 9e98d5b87b cd677d26c0
commit 929835c7e4
1 changed files with 2 additions and 0 deletions
--- a/lib/Utilities/LinenoiseShell.cpp
+++ b/lib/Utilities/LinenoiseShell.cpp
@ -81,7 +81,9 @@ LinenoiseShell::LinenoiseShell (std::string const& history,
                                Completer* completer)
  : ShellBase(history, completer) {
  COMPLETER = completer;
+#ifndef _WIN32
  linenoiseSetMultiLine(1);
+#endif
  linenoiseSetCompletionCallback(LinenoiseCompletionGenerator);
 }