From ae7990cc88dcc6a61edfe9e442174bc5b1bc3299 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 30 Mar 2007 13:24:35 +0000 Subject: [PATCH] * Work around a bug in Apple's GCC preprocessor. --- src/libmain/shared.cc | 4 ++-- src/libstore/local-store.cc | 2 +- src/nix-setuid-helper/nix-setuid-helper.cc | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index ca0a6e401..568c975c2 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -1,10 +1,10 @@ +#include "config.h" + #include "shared.hh" #include "globals.hh" #include "store-api.hh" #include "util.hh" -#include "config.h" - #include #include diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 0bf246f1e..cd83b8350 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -1,3 +1,4 @@ +#include "config.h" #include "local-store.hh" #include "util.hh" #include "globals.hh" @@ -7,7 +8,6 @@ #include "aterm.hh" #include "derivations-ast.hh" #include "worker-protocol.hh" -#include "config.h" #include #include diff --git a/src/nix-setuid-helper/nix-setuid-helper.cc b/src/nix-setuid-helper/nix-setuid-helper.cc index 58df479fc..37347cd28 100644 --- a/src/nix-setuid-helper/nix-setuid-helper.cc +++ b/src/nix-setuid-helper/nix-setuid-helper.cc @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -10,7 +12,6 @@ #include #include -#include "config.h" #include "util.hh" using namespace nix;