diff options
Diffstat (limited to 'src/nix')
| -rw-r--r-- | src/nix/command.hh | 2 | ||||
| -rw-r--r-- | src/nix/local.mk | 2 | ||||
| -rw-r--r-- | src/nix/repl.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/nix/command.hh b/src/nix/command.hh index daa3b3fa7030..6b34e3881e79 100644 --- a/src/nix/command.hh +++ b/src/nix/command.hh @@ -6,7 +6,7 @@ namespace nix { struct Value; -struct Bindings; +class Bindings; class EvalState; /* A command is an argument parser that can be executed by calling its diff --git a/src/nix/local.mk b/src/nix/local.mk index c7d2d328aab5..bddd53b168d3 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -2,7 +2,7 @@ programs += nix nix_DIR := $(d) -nix_SOURCES := $(wildcard $(d)/*.cc) src/linenoise/linenoise.c +nix_SOURCES := $(wildcard $(d)/*.cc) $(wildcard src/linenoise/*.cpp) nix_LIBS = libexpr libmain libstore libutil libformat diff --git a/src/nix/repl.cc b/src/nix/repl.cc index 28a8ebc8c499..1adb816c5bf0 100644 --- a/src/nix/repl.cc +++ b/src/nix/repl.cc @@ -185,7 +185,7 @@ void NixRepl::mainLoop(const std::vector<std::string> & files) bool NixRepl::getLine(string & input, const std::string &prompt) { char * s = linenoise(prompt.c_str()); - Finally doFree([&]() { linenoiseFree(s); }); + Finally doFree([&]() { free(s); }); if (!s) return false; input += s; return true; |