[build] Add config.h inclusion in order to take alignment issues into…

… account.
djn3m0 · Jan 14, 2008 · ebd8900 · ebd8900
1 parent 5103880
commit ebd8900
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/bitarray.h b/bitarray.h
@@ -24,6 +24,9 @@
 #include <inttypes.h>
 #include <stdlib.h>
 #include <unistd.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 /* read-only byte-aligned array */
 typedef struct bytearray {

diff --git a/bitstream_write.c b/bitstream_write.c
@@ -29,6 +29,9 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+/* For config.h */
+#include "bitarray.h"
+
 #undef HAVE_MMAP
 
 #ifdef HAVE_MMAP

diff --git a/xdl/xdl_lexer.l b/xdl/xdl_lexer.l
@@ -58,7 +58,7 @@ pip    { return PIP; }
 "=="|"=>"|"=-"|"->"     { return CONNECTION; }
 
 [a-zA-Z0-9_\-]* { copy_and_return(IDENTIFIER); } /* Should do otherwise */
-v[0-9]+.[0-9]+  { return VERSION; }
+v[0-9]+.[0-9]+  { return NCDVERSION; }
 
 <S_CONFIG>{
 [ \t\n]+     /* eat up whitespace */

diff --git a/xdl/xdl_parser.y b/xdl/xdl_parser.y
@@ -225,7 +225,7 @@ static int treat_design(parser_t *parser,
 /* Bison declaration */
 %token STRING
 %token IDENTIFIER
-%token VERSION
+%token NCDVERSION
 %token DESIGN
 
 %token LUTID
@@ -278,7 +278,7 @@ input:   /* empty */
 /* Design */
 design_name: STRING ;
 part: IDENTIFIER ;
-ncd_version: VERSION ;
+ncd_version: NCDVERSION ;
 
 device: IDENTIFIER ;
 package: IDENTIFIER ;