Merge remote-tracking branch 'origin/maint'

[bison.git] / src / output.h

diff --git a/src/output.h b/src/output.h
index 4e3799c6c297605c41b2f5fe2b98eb34cc5597df..d4b100fe872f4aba58891437a667703103a09a0f 100644 (file)
--- a/src/output.h
+++ b/src/output.h
@@ -1,37 +1,30 @@
 /* Output the generated parsing program for bison,
-   Copyright 2000, 2001  Free Software Foundation, Inc.
+
+   Copyright (C) 2000-2003, 2006-2007, 2009-2012 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison 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.
+   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 3 of the License, or
+   (at your option) any later version.
 
-   Bison 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.
+   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 Bison; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef OUTPUT_H_
 # define OUTPUT_H_
 
-extern int error_verbose;
-
 /* Output the parsing tables and the parser code to FTABLE.  */
-void output PARAMS ((void));
-
-size_t get_lines_number PARAMS ((const char *s));
-
-void actions_output PARAMS ((FILE *out, size_t *line));
-void guards_output PARAMS ((FILE *out, size_t *line));
-void token_definitions_output PARAMS ((FILE *out, size_t *line));
+void output (void);
 
-extern struct obstack muscle_obstack;
+/* Where our data files are installed.  */
+char const *pkgdatadir (void);
 
 #endif /* !OUTPUT_H_ */