X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c3d503425f8014b432601a33b3398446d63b5963..cac9e09bbf68269173df301cd06ad40b904d11ec:/tests/headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 4a4a72e3..8d70b35e 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,20 +1,18 @@
 # Bison Parser Headers.                               -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006, 2007 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# 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 Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AT_BANNER([[Parser Headers.]])
 
@@ -36,7 +34,7 @@ AT_DATA([input.y],
 exp: {};
 ])
 
-AT_CHECK([bison --defines input.y])
+AT_BISON_CHECK([--defines input.y])
 
 AT_CLEANUP
 
@@ -67,7 +65,7 @@ dummy:;
 #include <$1.h>
 ])
 
-AT_CHECK([bison --defines=$1.h --output=y.tab.c $1.y])
+AT_BISON_CHECK([--defines=$1.h --output=y.tab.c $1.y])
 
 AT_COMPILE([y.tab.o], [-I. -c y.tab.c])
 
@@ -94,9 +92,7 @@ AT_DATA_GRAMMAR([input.y],
 #include <stdio.h>
 #include <stdlib.h>
 
-int my_lex (void);
-
-int
+static int
 my_lex (void)
 {
   return EOF;
@@ -113,18 +109,14 @@ my_error (const char *msg)
 exp:;
 ])
 
-AT_CHECK([bison --defines -o input.c input.y])
+AT_BISON_CHECK([--defines -o input.c input.y])
 
 # YYLTYPE should be defined, and MY_LLOC declared.
 AT_DATA([caller.c],
 [[#include "input.h"
 YYLTYPE *my_llocp = &my_lloc;
 
-#ifndef YYPUSH_DECLS
 int my_parse (void);
-#else
-int my_lex (void);
-#endif
 
 int
 main (void)