* Make sure that config.h is included before the system headers,

  because it defines _FILE_OFFSET_BITS.  Without this, on 
  OpenSolaris the system headers define it to be 32, and then 
  the 32-bit stat() ends up being called with a 64-bit "struct 
  stat", or vice versa.

  This also ensures that we get 64-bit file sizes everywhere.

* Remove the redundant call to stat() in parseExprFromFile().
  The file cannot be a symlink because that's the exit condition
  of the loop before.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index e22ef7efcefb..ff6538137a8a 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -1,6 +1,3 @@
-#include <iostream>
-#include <algorithm>
-
 #include "globals.hh"
 #include "misc.hh"
 #include "archive.hh"
@@ -11,6 +8,9 @@
 #include "util.hh"
 #include "help.txt.hh"
 
+#include <iostream>
+#include <algorithm>
+
 
 using namespace nix;
 using std::cin;