about summary refs log tree commit diff
path: root/src/libexpr/value-to-xml.hh
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-10-04T17·55+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-10-04T17·55+0000
commit705868a8a96a10f70e629433cfffc2d5cd2703eb (patch)
treef5d17323d9719ea3d0e4b00533a7c23df508f216 /src/libexpr/value-to-xml.hh
parent95f4f2cf6102f95abf6948d74907c44c3540eddd (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/libexpr/value-to-xml.hh')
-rw-r--r--src/libexpr/value-to-xml.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/value-to-xml.hh b/src/libexpr/value-to-xml.hh
index 0c6de3a8b2e6..3ebc989ffa26 100644
--- a/src/libexpr/value-to-xml.hh
+++ b/src/libexpr/value-to-xml.hh
@@ -1,12 +1,12 @@
 #ifndef __VALUE_TO_XML_H
 #define __VALUE_TO_XML_H
 
-#include <string>
-#include <map>
-
 #include "nixexpr.hh"
 #include "eval.hh"
 
+#include <string>
+#include <map>
+
 namespace nix {
 
 void printValueAsXML(EvalState & state, bool strict, bool location,