about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-09-11T18·45-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-09-11T18·45-0400
commit295027f533bb5a754bfc62f934c88b43e9c100a6 (patch)
tree5d0702ab38c93bd44565d23e79234b2314d05efa
parentd3004c78d9816431224f7ac0416c5bfea0cc22cd (diff)
Include config.h before any other header
"config.h" must be included first, because otherwise the compiler
might not see the right value of _FILE_OFFSET_BITS.  We've had this
before; see 705868a8a96a10f70e629433cfffc2d5cd2703eb.  In this case,
GCC would compute a different address for ‘settings.useSubstitutes’ in
misc.cc because of the off_t in ‘settings’.

Reverts 3854fc9b42d16b810f62b64194b699033b03aaf1.

http://hydra.nixos.org/build/3016700
-rw-r--r--src/libstore/derivations.hh4
-rw-r--r--src/libutil/types.hh2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 8f22b4afa6a1..a5ffc2252064 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <map>
-
 #include "types.hh"
 #include "hash.hh"
 
+#include <map>
+
 
 namespace nix {
 
diff --git a/src/libutil/types.hh b/src/libutil/types.hh
index 165a46fa28e9..a2ab1cc0ee83 100644
--- a/src/libutil/types.hh
+++ b/src/libutil/types.hh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "config.h"
+
 #include <string>
 #include <list>
 #include <set>