diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-11 14:45:42 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-11 14:45:42 -0400 |
| commit | 295027f533bb5a754bfc62f934c88b43e9c100a6 (patch) | |
| tree | 5d0702ab38c93bd44565d23e79234b2314d05efa /src | |
| parent | d3004c78d9816431224f7ac0416c5bfea0cc22cd (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
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/derivations.hh | 4 | ||||
| -rw-r--r-- | src/libutil/types.hh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index 8f22b4afa..a5ffc2252 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 165a46fa2..a2ab1cc0e 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> |