diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-30T22·11+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-30T22·17+0100 |
commit | 699ab4e20a252c649339831e7c1b8a028d9fd8e8 (patch) | |
tree | bb763cf0c51e9fe295c3fd1be56ef8c925ca2902 /third_party/nix/src/nix/repl.cc | |
parent | 91ddc7603d2fa2b59299375adc8a245558a9e811 (diff) |
chore(3p/nix): Clean up some unused defines r/872
Diffstat (limited to 'third_party/nix/src/nix/repl.cc')
-rw-r--r-- | third_party/nix/src/nix/repl.cc | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/third_party/nix/src/nix/repl.cc b/third_party/nix/src/nix/repl.cc index 65a22382b248..9431b5b60f55 100644 --- a/third_party/nix/src/nix/repl.cc +++ b/third_party/nix/src/nix/repl.cc @@ -7,22 +7,8 @@ #include <absl/strings/ascii.h> #include <absl/strings/match.h> -#include <glog/logging.h> - -#ifdef READLINE -#include <readline/history.h> -#include <readline/readline.h> -#else -// editline < 1.15.2 don't wrap their API for C++ usage -// (added in -// https://github.com/troglobit/editline/commit/91398ceb3427b730995357e9d120539fb9bb7461). -// This results in linker errors due to to name-mangling of editline C symbols. -// For compatibility with these versions, we wrap the API here -// (wrapping multiple times on newer versions is no problem). -extern "C" { #include <editline.h> -} -#endif +#include <glog/logging.h> #include "libexpr/common-eval-args.hh" #include "libexpr/eval-inline.hh" @@ -242,15 +228,11 @@ void NixRepl::mainLoop(const std::vector<std::string>& files) { // Allow nix-repl specific settings in .inputrc rl_readline_name = "nix-repl"; createDirs(dirOf(historyFile)); -#ifndef READLINE el_hist_size = 1000; -#endif read_history(historyFile.c_str()); curRepl = this; -#ifndef READLINE rl_set_complete_func(completionCallback); rl_set_list_possib_func(listPossibleCallback); -#endif std::string input; |