2006-10-12 Paul Eggert <eggert@cs.ucla.edu>
+ * bootstrap.conf (gnulib_modules): Add config-h.
+ * djgpp/subpipe.c: Include <config.h> unconditionally; don't
+ worry about HAVE_CONFIG_H.
+ * lib/abitset.c: Likewise.
+ * lib/bitset.c: Likewise.
+ * lib/bitset_stats.c: Likewise.
+ * lib/bitsetv-print.c: Likewise.
+ * lib/bitsetv.c: Likewise.
+ * lib/ebitset.c: Likewise.
+ * lib/get-errno.c: Likewise.
+ * lib/lbitset.c: Likewise.
+ * lib/subpipe.c: Likewise.
+ * lib/timevar.c: Likewise.
+ * lib/vbitset.c: Likewise.
+ * lib/bitset.c: Include "bitset.h" first, to test interface.
+ * lib/bitset_stats.c: Include "bitset_stats.h" first.
+ * lib/bitsetv-print.c: Include "bitsetv-print.h" first.
+ * lib/bitsetv.c: Include "bitsetv.h" first.
+ * lib/get-errno.c: Include "get-errno.h" first.
+ * m4/.cvsignore: Add config-h.m4.
+ * tests/actions.at (Default %printer and %destructor for ...):
+ Adjust expected line numbers in output to reflect removal of #if
+ HAVE_CONFIG_H lines.
+ * tests/glr-regression.at (Missed %merge type warnings when ...):
+ Likewise.
+ * tests/regression.at (Braced code in declaration in rules section):
+ Likewise.
+ * tests/atlocal.in (CPPFLAGS): Don't define HAVE_CONFIG_H.
+ * tests/local.at (AT_DATA_GRAMMAR_PROLOGUE):
+ Include <config.h> unconditionally.
+
* bootstrap: Sync from coreutils, as follows:
2006-10-11 Paul Eggert <eggert@cs.ucla.edu>
# gnulib modules used by this package.
gnulib_modules='
- argmatch configmake dirname error extensions fopen-safer
+ argmatch config-h configmake dirname error extensions fopen-safer
getopt gettext hash inttypes malloc mbswidth obstack quote
quotearg stdbool stpcpy strerror strtoul strverscmp unistd
unistd-safer unlocked-io verify xalloc xalloc-die xstrndup
/* Written by Juan Manuel Guerrero <juan.guerrero@gmx.de>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "subpipe.h"
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "abitset.h"
#include <stddef.h>
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
+#include "bitset.h"
#include <stdlib.h>
#include <string.h>
-#include "bitset.h"
#include "abitset.h"
#include "lbitset.h"
#include "ebitset.h"
operations get vectored through here and we then call the appropriate
routines. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
+#include "bitset_stats.h"
#include "bbitset.h"
#include "abitset.h"
#include "ebitset.h"
#include "lbitset.h"
#include "vbitset.h"
-#include "bitset_stats.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
-#include <stdlib.h>
#include "bitsetv-print.h"
+#include <stdlib.h>
+
/*--------------------------------------------------------.
| Display the MATRIX array of SIZE bitsets of size SIZE. |
`--------------------------------------------------------*/
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
-#include <stdlib.h>
#include "bitsetv.h"
+#include <stdlib.h>
+
/* Create a vector of N_VECS bitsets, each of N_BITS, and of
type TYPE. */
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "ebitset.h"
+
#include "obstack.h"
#include <stdlib.h>
#include <string.h>
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <errno.h>
+#include <config.h>
#include "get-errno.h"
+#include <errno.h>
+
/* Get and set errno. A source file that needs to set or get errno,
but doesn't need to test for specific errno values, can use these
functions to avoid namespace pollution. For example, a file that
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "lbitset.h"
+
#include "obstack.h"
#include <stddef.h>
#include <stdlib.h>
/* Written by Paul Eggert <eggert@twinsun.com>
and Florian Krohm <florian@edamail.fishkill.ibm.com>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "subpipe.h"
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#if IN_GCC
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "vbitset.h"
+
#include <stdlib.h>
#include <string.h>
absolute-header.m4
argmatch.m4
+config-h.m4
dirname.m4
dos.m4
double-slash-root.m4
]],
[[Starting parse
Entering state 0
-Reducing stack by rule 1 (line 37):
+Reducing stack by rule 1 (line 35):
-> $$ = nterm start (1.1-1.1: Default printer for 'S' @ 1)
Stack now 0
Entering state 1
CFLAGS='@O0CFLAGS@ @WARNING_CFLAGS@ @WERROR_CFLAGS@'
# We need `config.h'.
-CPPFLAGS="-DHAVE_CONFIG_H=1 -I$abs_top_builddir/lib @CPPFLAGS@"
+CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
# Is the compiler GCC?
GCC='@GCC@'
]])
AT_CHECK([[bison -o glr-regr18.c glr-regr18.y]], 1, [],
-[glr-regr18.y:28.18-24: result type clash on merge function `merge': <type2> != <type1>
-glr-regr18.y:27.18-24: previous declaration
-glr-regr18.y:29.13-19: result type clash on merge function `merge': <type3> != <type2>
-glr-regr18.y:28.18-24: previous declaration
+[glr-regr18.y:26.18-24: result type clash on merge function `merge': <type2> != <type1>
+glr-regr18.y:25.18-24: previous declaration
+glr-regr18.y:27.13-19: result type clash on merge function `merge': <type3> != <type2>
+glr-regr18.y:26.18-24: previous declaration
])
AT_CLEANUP
m4_pushdef([AT_GLR_OR_PARAM_IF],
[m4_bmatch([$3], [%glr-parser\|%parse-param], [$1], [$2])])
m4_pushdef([AT_NAME_PREFIX],
-[m4_bmatch([$3], [%name-prefix=".*"],
+[m4_bmatch([$3], [%name-prefix=".*"],
[m4_bregexp([$3], [name-prefix="\([^"]*\)"], [\1])],
[yy])])
# yyerror receives the location if %location & %pure & (%glr or %parse-param).
# meant to be compiled.
m4_define([AT_DATA_GRAMMAR_PROLOGUE],
[[%{
-#ifdef HAVE_CONFIG_H
-# include <config.h>
- /* We don't need perfect functions for these tests. */
-# undef malloc
-# undef memcmp
-# undef realloc
-#endif
+#include <config.h>
+/* We don't need perfect functions for these tests. */
+#undef malloc
+#undef memcmp
+#undef realloc
%}]
])
]],
[[Starting parse
Entering state 0
-Reducing stack by rule 1 (line 22):
+Reducing stack by rule 1 (line 20):
-> $$ = nterm start ()
Stack now 0
Entering state 1