about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2009-12-16T15·29+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2009-12-16T15·29+0000
commit945d8218fbcab4e546213f420125bf521ff3306d (patch)
treed15b1aa73c71f41f60f6a58851b0307da74fc55b
parentd8a5dc02fc2efbbd386edb4be960d741c0650b8a (diff)
* Build correctly against newer ATerm releases. Fixes "error: 'union'
  tag used in naming 'struct _ATerm'".

-rw-r--r--src/libstore/derivations.hh2
-rw-r--r--src/libutil/aterm-map.hh3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 3aa750962e79..042f4738d469 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -1,7 +1,7 @@
 #ifndef __DERIVATIONS_H
 #define __DERIVATIONS_H
 
-typedef struct _ATerm * ATerm;
+#include <aterm1.h>
 
 #include "hash.hh"
 
diff --git a/src/libutil/aterm-map.hh b/src/libutil/aterm-map.hh
index db36da377a79..b732453a7600 100644
--- a/src/libutil/aterm-map.hh
+++ b/src/libutil/aterm-map.hh
@@ -1,8 +1,7 @@
 #ifndef __ATERM_MAP_H
 #define __ATERM_MAP_H
 
-typedef struct _ATerm * ATerm;
-
+#include <aterm1.h>
 #include <assert.h>