From 705868a8a96a10f70e629433cfffc2d5cd2703eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 4 Oct 2010 17:55:38 +0000
Subject: * 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.
---
 src/libexpr/nixexpr.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libexpr/nixexpr.hh')

diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index b1043a32684e..1d03220f644a 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -1,10 +1,10 @@
 #ifndef __NIXEXPR_H
 #define __NIXEXPR_H
 
-#include <map>
-
 #include "symbol-table.hh"
 
+#include <map>
+
 
 namespace nix {
 
-- 
cgit 1.4.1