diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-04 17:55:38 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-04 17:55:38 +0000 |
| commit | 705868a8a96a10f70e629433cfffc2d5cd2703eb (patch) | |
| tree | f5d17323d9719ea3d0e4b00533a7c23df508f216 /src/libstore | |
| 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/libstore')
| -rw-r--r-- | src/libstore/store-api.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 0590f448c..6fc0689ba 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -1,14 +1,14 @@ #ifndef __STOREAPI_H #define __STOREAPI_H +#include "hash.hh" +#include "serialise.hh" + #include <string> #include <map> #include <boost/shared_ptr.hpp> -#include "hash.hh" -#include "serialise.hh" - namespace nix { |