Work around portability problem on Solaris 10: flex-generated

files include <stdio.h> before <config.h>, which messes up
because the latter defines __EXTENSIONS__.  Address the problem
by creating two new little files that include <config.h> first,
then include the flex-generated files.  Rewrite everyone else
to include <config.h> first, as well.
* lib/timevar.c: Always include "config.h".
* src/Makefile.am (bison_SOURCES): Replace scan-gram.l with
scan-gram-c.c, and scan-skel.l with scan-skel-c.c.
(EXTRA_bison_SOURCES): New macro.
* src/scan-gram-c.c, src/scan-skel-c.c: New files.
* src/system.h: Don't include config.h.
* src/LR0.c: Include <config.h> first.
* src/assoc.c: Likewise.
* src/closure.c: Likewise.
* src/complain.c: Likewise.
* src/conflicts.c: Likewise.
* src/derives.c: Likewise.
* src/files.c: Likewise.
* src/getargs.c: Likewise.
* src/gram.c: Likewise.
* src/lalr.c: Likewise.
* src/location.c: Likewise.
* src/main.c: Likewise.
* src/muscle_tab.c: Likewise.
* src/nullable.c: Likewise.
* src/output.c: Likewise.
* src/parse-gram.y: Likewise.
* src/print.c: Likewise.
* src/print_graph.c: Likewise.
* src/reader.c: Likewise.
* src/reduce.c: Likewise.
* src/relation.c: Likewise.
* src/state.c: Likewise.
* src/symlist.c: Likewise.
* src/symtab.c: Likewise.
* src/tables.c: Likewise.
* src/uniqstr.c: Likewise.
* src/vcg.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5d03a68f8445fc4359c75d6a116d7ecd7201cbd8..292460faa42db91278b8bf3b719ee9b263db94ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,45 @@
 2005-12-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 2005-12-09  Paul Eggert  <eggert@cs.ucla.edu>
 

+       Work around portability problem on Solaris 10: flex-generated
+       files include <stdio.h> before <config.h>, which messes up
+       because the latter defines __EXTENSIONS__.  Address the problem
+       by creating two new little files that include <config.h> first,
+       then include the flex-generated files.  Rewrite everyone else
+       to include <config.h> first, as well.
+       * lib/timevar.c: Always include "config.h".
+       * src/Makefile.am (bison_SOURCES): Replace scan-gram.l with
+       scan-gram-c.c, and scan-skel.l with scan-skel-c.c.
+       (EXTRA_bison_SOURCES): New macro.
+       * src/scan-gram-c.c, src/scan-skel-c.c: New files.
+       * src/system.h: Don't include config.h.
+       * src/LR0.c: Include <config.h> first.
+       * src/assoc.c: Likewise.
+       * src/closure.c: Likewise.
+       * src/complain.c: Likewise.
+       * src/conflicts.c: Likewise.
+       * src/derives.c: Likewise.
+       * src/files.c: Likewise.
+       * src/getargs.c: Likewise.
+       * src/gram.c: Likewise.
+       * src/lalr.c: Likewise.
+       * src/location.c: Likewise.
+       * src/main.c: Likewise.
+       * src/muscle_tab.c: Likewise.
+       * src/nullable.c: Likewise.
+       * src/output.c: Likewise.
+       * src/parse-gram.y: Likewise.
+       * src/print.c: Likewise.
+       * src/print_graph.c: Likewise.
+       * src/reader.c: Likewise.
+       * src/reduce.c: Likewise.
+       * src/relation.c: Likewise.
+       * src/state.c: Likewise.
+       * src/symlist.c: Likewise.
+       * src/symtab.c: Likewise.
+       * src/tables.c: Likewise.
+       * src/uniqstr.c: Likewise.
+       * src/vcg.c: Likewise.
+

        * src/parse-gram.y: Fix minor problems uncovered by lint.
        (current_lhs, current_lhs_location): Now static.
        (current_assoc): Remove unused variable.
        * src/parse-gram.y: Fix minor problems uncovered by lint.
        (current_lhs, current_lhs_location): Now static.
        (current_assoc): Remove unused variable.

diff --git a/lib/timevar.c b/lib/timevar.c
index d647687fea7b018b2845a5fb7bc1a3a0e7bcb6f8..33eec0d832ae03ea71225846507140ab2613052b 100644 (file)
--- a/lib/timevar.c
+++ b/lib/timevar.c
@@ -1,5 +1,5 @@
 /* Timing variables for measuring compiler performance.
 /* Timing variables for measuring compiler performance.

-   Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2004, 2005 Free Software Foundation, Inc.

    Contributed by Alex Samuel <samuel@codesourcery.com>
 
 This file is part of Bison, the GNU Compiler Compiler.
    Contributed by Alex Samuel <samuel@codesourcery.com>
 
 This file is part of Bison, the GNU Compiler Compiler.


@@ -19,9 +19,10 @@ along with Bison; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 

+#include "config.h"
+

 #if IN_GCC
 
 #if IN_GCC
 

-#include "config.h"

 #include "system.h"
 #include "intl.h"
 #include "rtl.h"
 #include "system.h"
 #include "intl.h"
 #include "rtl.h"

diff --git a/src/LR0.c b/src/LR0.c
index 2cba955a3d77b4fe77f0f5f7fce140e101939154..259b8912facbb323bd250fd3f07d22c6ceeec2e9 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -24,6 +24,7 @@
 /* See comments in state.h for the data structures that represent it.
    The entry point is generate_states.  */
 
 /* See comments in state.h for the data structures that represent it.
    The entry point is generate_states.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <bitset.h>
 #include "system.h"
 
 #include <bitset.h>

diff --git a/src/Makefile.am b/src/Makefile.am
index 4fc07a29a1ab9f8e41bd4560de389c856c25f70a..c973e9e75c3d1a7eb13e757c5013b3f0766cafeb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,8 +53,8 @@ bison_SOURCES =                                         \
        reader.c reader.h                         \
        reduce.c reduce.h                         \
        relation.c relation.h                     \
        reader.c reader.h                         \
        reduce.c reduce.h                         \
        relation.c relation.h                     \

-       scan-gram.l                               \
-       scan-skel.h scan-skel.l                   \
+       scan-gram-c.c                             \
+       scan-skel-c.c scan-skel.h                 \

        state.c state.h                           \
        symlist.c symlist.h                       \
        symtab.c symtab.h                         \
        state.c state.h                           \
        symlist.c symlist.h                       \
        symtab.c symtab.h                         \


@@ -64,6 +64,8 @@ bison_SOURCES =                                         \
        vcg.c vcg.h                               \
        vcg_defaults.h
 
        vcg.c vcg.h                               \
        vcg_defaults.h
 

+EXTRA_bison_SOURCES = scan-skel.l scan-gram.l
+

 BUILT_SOURCES = scan-skel.c scan-gram.c parse-gram.c parse-gram.h
 
 MOSTLYCLEANFILES = yacc
 BUILT_SOURCES = scan-skel.c scan-gram.c parse-gram.c parse-gram.h
 
 MOSTLYCLEANFILES = yacc

diff --git a/src/assoc.c b/src/assoc.c
index b816499c857fe37d2eeb56f76ddec00f50f921a5..479abd8cdd3f7c46e4c50b469ae14abc8474c101 100644 (file)
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,5 +1,5 @@
 /* Associativity information.
 /* Associativity information.

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -18,6 +18,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include "assoc.h"
 #include "system.h"
 
 #include "assoc.h"

diff --git a/src/closure.c b/src/closure.c
index eb53ee0562768a3aa508f2a876b918943813fc38..001b8316a735f32cec1fc698ecfbd9906908f441 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,7 +1,7 @@
 /* Closures for Bison
 
 /* Closures for Bison
 

-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005 Free
+   Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -20,6 +20,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <bitset.h>
 #include "system.h"
 
 #include <bitset.h>

diff --git a/src/complain.c b/src/complain.c
index 4769df5c27d7ca102724fcbc1ab65fad3d8d981a..927dbb6305a183c836daf1e0c503c062e31e1b18 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 /* Declaration for error-reporting function for Bison.

-   Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the


@@ -19,6 +20,7 @@
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <stdarg.h>
 #include "system.h"
 
 #include <stdarg.h>

diff --git a/src/conflicts.c b/src/conflicts.c
index 374c4010156de0c8442d50b99e3dc75737b774fb..a0296d6735b33acb93c7ae4fc7f4fe63a66f89cd 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -20,6 +20,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <bitset.h>
 #include "system.h"
 
 #include <bitset.h>

diff --git a/src/derives.c b/src/derives.c
index 24fde5d2d6ff576fe1ab3b42ff3dbc8ccac2530a..2e4ff31ba68c807908c76963ffd9d7a003f1bf9b 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,7 +1,7 @@
 /* Match rules with nonterminals for bison,
 
 /* Match rules with nonterminals for bison,
 

-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2005 Free
+   Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -20,7 +20,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

-
+#include <config.h>

 #include "system.h"
 
 #include "getargs.h"
 #include "system.h"
 
 #include "getargs.h"

diff --git a/src/files.c b/src/files.c
index 4acf9e898935196df6e2ee12837b9ddd081719e2..5bc862d8881f09cac73065a2fb229aa9c5c91760 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -20,7 +20,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 

-
+#include <config.h>

 #include "system.h"
 
 #include <error.h>
 #include "system.h"
 
 #include <error.h>

diff --git a/src/getargs.c b/src/getargs.c
index 2b6fa0fbbd11490404d39cfbd4e895e77353d9d0..3d45a3c60e16ca8e2190b0125ac7ee8724545443 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -20,6 +20,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <argmatch.h>
 #include "system.h"
 
 #include <argmatch.h>

diff --git a/src/gram.c b/src/gram.c
index 4636f4e14c11d286c9ee6a9f588b09a156aa286e..cff87d7c031c8951e93b223117438c24d78612f9 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
 /* Allocate input grammar variables for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003, 2005 Free
+   Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -20,7 +20,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

-
+#include <config.h>

 #include "system.h"
 
 #include <quotearg.h>
 #include "system.h"
 
 #include <quotearg.h>

diff --git a/src/lalr.c b/src/lalr.c
index 8627f1cbc3c5596130ba78c7f1469b8158ead285..e0fae49f712eb5e261bd7799cd7c2a8ccdfb97b7 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,6 +1,6 @@
 /* Compute look-ahead criteria for Bison.
 
 /* Compute look-ahead criteria for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -25,6 +25,7 @@
    which rules need look-ahead in each state, and which look-ahead
    tokens they accept.  */
 
    which rules need look-ahead in each state, and which look-ahead
    tokens they accept.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <bitset.h>
 #include "system.h"
 
 #include <bitset.h>

diff --git a/src/location.c b/src/location.c
index 8c235bbbf98a737385b1d6be57b5dcd2e5745cc3..ecd3658b14cb42de74548343c004b878388fa1ac 100644 (file)
--- a/src/location.c
+++ b/src/location.c
@@ -1,5 +1,6 @@
 /* Locations for Bison
 /* Locations for Bison

-   Copyright (C) 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2005 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -18,6 +19,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <quotearg.h>
 #include "system.h"
 
 #include <quotearg.h>

diff --git a/src/main.c b/src/main.c
index 65db7ca1bcf19d63c6cbbc8e0e50fc8a2f3b9838..8769fef8aa0ae2ab95b300a2da2d9aac8fffaca4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

-
+#include <config.h>

 #include "system.h"
 
 #include <bitset_stats.h>
 #include "system.h"
 
 #include <bitset_stats.h>

diff --git a/src/muscle_tab.c b/src/muscle_tab.c
index 3e0fb289decf4c55aa375a324fc0194783f6bd31..c8c5c79d63faa050126919c2e65ccc3c582b757d 100644 (file)
--- a/src/muscle_tab.c
+++ b/src/muscle_tab.c
@@ -20,6 +20,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <hash.h>
 #include "system.h"
 
 #include <hash.h>

diff --git a/src/nullable.c b/src/nullable.c
index e73344f8283f1552474879eca64a112fd0328e66..ef65ef46af481826b19ab90c4614b1c11551b562 100644 (file)
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,6 +1,6 @@
 /* Calculate which nonterminals can expand into the null string for Bison.
 
 /* Calculate which nonterminals can expand into the null string for Bison.
 

-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004 Free
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004, 2005 Free

    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -25,6 +25,7 @@
    the null string.  NULLABLE[I - NTOKENS] is nonzero if symbol I can
    do so.  */
 
    the null string.  NULLABLE[I - NTOKENS] is nonzero if symbol I can
    do so.  */
 

+#include <config.h>

 #include "system.h"
 
 #include "getargs.h"
 #include "system.h"
 
 #include "getargs.h"

diff --git a/src/output.c b/src/output.c
index 1f3bbcaaa8e5a38f3086f958855ac5e4618e6116..c0be5b0be8fb9a63e3be9b8753300ddb6243a6fc 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -20,7 +20,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 

-
+#include <config.h>

 #include "system.h"
 
 #include <error.h>
 #include "system.h"
 
 #include <error.h>

diff --git a/src/parse-gram.y b/src/parse-gram.y
index bf6af663ba2ffc560232c617da98f7a6e0b28580..d4f2731e6cea38f41b8e85ec7f03f0d110f5d4b2 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -20,6 +20,7 @@
    02110-1301  USA
 */
 
    02110-1301  USA
 */
 

+#include <config.h>

 #include "system.h"
 
 #include "complain.h"
 #include "system.h"
 
 #include "complain.h"

diff --git a/src/print.c b/src/print.c
index 533e3ca1d73765348c61f0467c2ecc5a1fd3f468..cb1600c9fad853e1aef93ae48921a208b9c79dfd 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,6 +1,6 @@
 /* Print information on generated parser, for bison,
 
 /* Print information on generated parser, for bison,
 

-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -20,7 +20,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

-
+#include <config.h>

 #include "system.h"
 
 #include <bitset.h>
 #include "system.h"
 
 #include <bitset.h>

diff --git a/src/print_graph.c b/src/print_graph.c
index dc0f8306c70b46f411e70f1a1f8cdbebcf03abfb..9580f3f145ab9d204fc391bf63d0df6ea8382b98 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -19,6 +19,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <quotearg.h>
 #include "system.h"
 
 #include <quotearg.h>

diff --git a/src/reader.c b/src/reader.c
index 62f645b403794c8e9ec9d3cc482f2202fb83a3c3..fed446ad323d3b631883b7d99800872bf34f4811 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -20,6 +20,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <quotearg.h>
 #include "system.h"
 
 #include <quotearg.h>

diff --git a/src/reduce.c b/src/reduce.c
index a6b9e629089ed7ea4fd9d7cd2f557130d2ee7d5f..72ee3f8a299b80a2d3db4eef3aac99814fd4578a 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,7 +1,7 @@
 /* Grammar reduction for Bison.
 
 /* Grammar reduction for Bison.
 

-   Copyright (C) 1988, 1989, 2000, 2001, 2002, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988, 1989, 2000, 2001, 2002, 2003, 2005 Free
+   Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -27,6 +27,7 @@
 /* Don't eliminate unreachable terminals: They may be used by the
    user's parser.  */
 
 /* Don't eliminate unreachable terminals: They may be used by the
    user's parser.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <bitset.h>
 #include "system.h"
 
 #include <bitset.h>

diff --git a/src/relation.c b/src/relation.c
index da62af8fb0e8f68125db248a2c4a16a667f94baa..1d2b42dd9f34efb802e8617b9905f9c3d8327195 100644 (file)
--- a/src/relation.c
+++ b/src/relation.c
@@ -18,6 +18,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <bitsetv.h>
 #include "system.h"
 
 #include <bitsetv.h>

diff --git a/src/state.c b/src/state.c
index e78db69bd41545bed1b796d0b20076c48bfa9de6..d7289a3b5ebc0efb33a7603a01aa989a12d977ee 100644 (file)
--- a/src/state.c
+++ b/src/state.c
@@ -19,7 +19,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

-
+#include <config.h>

 #include "system.h"
 
 #include <hash.h>
 #include "system.h"
 
 #include <hash.h>

diff --git a/src/symlist.c b/src/symlist.c
index 106db46cb2f5f662f0fcd3937fc4fd8356334b8d..7c3ebff6b637ae6ce2278bbdf7596b6e232e3a53 100644 (file)
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -19,6 +19,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include "complain.h"
 #include "system.h"
 
 #include "complain.h"

diff --git a/src/symtab.c b/src/symtab.c
index 8cbfc54f6c64d446306fa7e21bfe6cf725fd058f..634ddfa0df8ee868027f2907b2b178844969f502 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -20,7 +20,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

-
+#include <config.h>

 #include "system.h"
 
 #include <hash.h>
 #include "system.h"
 
 #include <hash.h>

diff --git a/src/system.h b/src/system.h
index 369218cd0b82f7af5aef92710615067d7dcd8cc4..74639ec5fa47759d043f1e55ad22999e2749dba4 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -20,10 +20,6 @@
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 

-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-

 #include <limits.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdlib.h>

diff --git a/src/tables.c b/src/tables.c
index 02d10f1573d9145f59d8717e62c087b6f3f53207..f88180e283a2cc67606c9a2186b3ac94d2203cc3 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -20,7 +20,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.  */
 

-
+#include <config.h>

 #include "system.h"
 
 #include <bitsetv.h>
 #include "system.h"
 
 #include <bitsetv.h>

diff --git a/src/uniqstr.c b/src/uniqstr.c
index f082f338b27979cf0654dea0a4c4413867020c03..8804a80e0e96c9d094f78e77caab8a6f493836b7 100644 (file)
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -19,6 +19,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <error.h>
 #include "system.h"
 
 #include <error.h>

diff --git a/src/vcg.c b/src/vcg.c
index fa5133888b7e089e12a0f2652bed62bfaff7604c..643a119839d0a269d5b2e09dfcfa7e1c95ec9fd0 100644 (file)
--- a/src/vcg.c
+++ b/src/vcg.c
@@ -19,6 +19,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <quotearg.h>
 #include "system.h"
 
 #include <quotearg.h>