about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-09-05T08·54+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-09-05T08·54+0000
commitfc195519b5dfbb8e7901cf6672fb4af36df9b350 (patch)
treedd70f6e53903b5f1432d96c903bb40eb5c233a15
parentbafc1690fc4a2a2c3ff81ff1c1a677f208d3b1b7 (diff)
* Sone missing #includes.
-rwxr-xr-xsrc/aterm-helper.pl1
-rw-r--r--src/libexpr/nixexpr.cc1
-rw-r--r--src/nix-store/main.cc2
3 files changed, 3 insertions, 1 deletions
diff --git a/src/aterm-helper.pl b/src/aterm-helper.pl
index 54eb33abda8e..5b7b33691d21 100755
--- a/src/aterm-helper.pl
+++ b/src/aterm-helper.pl
@@ -40,6 +40,7 @@ my $initFun = "init";
 open HEADER, ">$ARGV[0]";
 open IMPL, ">$ARGV[1]";
 
+print HEADER "#include <aterm2.h>\n";
 print HEADER "#ifdef __cplusplus\n";
 print HEADER "namespace nix {\n";
 print HEADER "#endif\n\n\n";
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index b7ccb656cf35..9622a03285f3 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -1,6 +1,7 @@
 #include "nixexpr.hh"
 #include "derivations.hh"
 #include "util.hh"
+#include "aterm.hh"
 
 #include "nixexpr-ast.hh"
 #include "nixexpr-ast.cc"
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index 616cb8310631..42c3074ff4e6 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -503,7 +503,7 @@ struct PrintFreed
     bool show, dryRun;
     unsigned long long bytesFreed;
     PrintFreed(bool show, bool dryRun)
-        : bytesFreed(0), show(show), dryRun(dryRun) { }
+        : show(show), dryRun(dryRun), bytesFreed(0) { }
     ~PrintFreed() 
     {
         if (show)