diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-04T17·55+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-04T17·55+0000 |
commit | 705868a8a96a10f70e629433cfffc2d5cd2703eb (patch) | |
tree | f5d17323d9719ea3d0e4b00533a7c23df508f216 /src/nix-hash/nix-hash.cc | |
parent | 95f4f2cf6102f95abf6948d74907c44c3540eddd (diff) |
* 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.
Diffstat (limited to 'src/nix-hash/nix-hash.cc')
-rw-r--r-- | src/nix-hash/nix-hash.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix-hash/nix-hash.cc b/src/nix-hash/nix-hash.cc index 1282af070e62..f268e4986701 100644 --- a/src/nix-hash/nix-hash.cc +++ b/src/nix-hash/nix-hash.cc @@ -1,9 +1,9 @@ -#include <iostream> - #include "hash.hh" #include "shared.hh" #include "help.txt.hh" +#include <iostream> + using namespace nix; |