version 2.7.90

[bison.git] / src / scan-gram.h

diff --git a/src/scan-gram.h b/src/scan-gram.h
index d9224c0cc375b8ebe9d0b5fdd7f39d231217f3a2..ee397ed2e794474685ffaa987885654a5cec1461 100644 (file)
--- a/src/scan-gram.h
+++ b/src/scan-gram.h
@@ -1,12 +1,12 @@
 /* Bison Grammar Scanner
 
 /* Bison Grammar Scanner
 

-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.

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

-   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
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,10 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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/>.  */

 
 #ifndef SCAN_GRAM_H_
 # define SCAN_GRAM_H_
 
 #ifndef SCAN_GRAM_H_
 # define SCAN_GRAM_H_


@@ -35,7 +32,7 @@ void gram_scanner_last_string_free (void);
 extern FILE *gram_out;
 extern int gram_lineno;
 
 extern FILE *gram_out;
 extern int gram_lineno;
 

-# define GRAM_LEX_DECL int gram_lex (YYSTYPE *val, location *loc)
+# define GRAM_LEX_DECL int gram_lex (GRAM_STYPE *val, location *loc)

 GRAM_LEX_DECL;
 
 #endif /* !SCAN_GRAM_H_ */
 GRAM_LEX_DECL;
 
 #endif /* !SCAN_GRAM_H_ */