diff options
| -rw-r--r-- | src/libexpr/nixexpr.hh | 2 | ||||
| -rw-r--r-- | src/libexpr/parser.y | 9 | ||||
| -rw-r--r-- | src/libstore/derivations.cc | 1 | ||||
| -rw-r--r-- | src/libstore/derivations.hh | 3 | ||||
| -rw-r--r-- | src/libstore/misc.cc | 2 | ||||
| -rw-r--r-- | src/libutil/aterm-map.cc | 2 | ||||
| -rw-r--r-- | src/libutil/aterm-map.hh | 3 |
7 files changed, 13 insertions, 9 deletions
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index af39997c5..69a47a5ad 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -3,8 +3,6 @@ #include <map> -#include <aterm2.h> - #include "aterm-map.hh" #include "types.hh" diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 1f141c7bb..dd4d509a4 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -11,14 +11,13 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <aterm2.h> - -#include "parser-tab.hh" -#include "lexer-tab.hh" #include "aterm.hh" #include "util.hh" +#include "parser-tab.hh" +#include "lexer-tab.hh" + #include "nixexpr.hh" #include "nixexpr-ast.hh" @@ -38,7 +37,7 @@ struct ParseData }; -static ATerm fixAttrs(int recursive, ATermList as) +static Expr fixAttrs(int recursive, ATermList as) { ATermList bs = ATempty, cs = ATempty; ATermList * is = recursive ? &cs : &bs; diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index d6291cd45..61b3ea89c 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -1,5 +1,6 @@ #include "derivations.hh" #include "store.hh" +#include "aterm.hh" #include "derivations-ast.hh" #include "derivations-ast.cc" diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index d1c9db508..3aa750962 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/derivations.hh @@ -1,7 +1,8 @@ #ifndef __DERIVATIONS_H #define __DERIVATIONS_H -#include "aterm.hh" +typedef struct _ATerm * ATerm; + #include "hash.hh" #include <map> diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc index 156d059b6..bcede901c 100644 --- a/src/libstore/misc.cc +++ b/src/libstore/misc.cc @@ -3,6 +3,8 @@ #include "build.hh" #include "db.hh" +#include <aterm2.h> + namespace nix { diff --git a/src/libutil/aterm-map.cc b/src/libutil/aterm-map.cc index 6c53e07c4..c31fcdba3 100644 --- a/src/libutil/aterm-map.cc +++ b/src/libutil/aterm-map.cc @@ -5,6 +5,8 @@ #include <assert.h> #include <stdlib.h> +#include <aterm2.h> + namespace nix { diff --git a/src/libutil/aterm-map.hh b/src/libutil/aterm-map.hh index 293df1eb5..3035b6ec5 100644 --- a/src/libutil/aterm-map.hh +++ b/src/libutil/aterm-map.hh @@ -1,7 +1,8 @@ #ifndef __ATERM_MAP_H #define __ATERM_MAP_H -#include <aterm2.h> +typedef struct _ATerm * ATerm; + #include <assert.h> |