More changes to pacify C++ compilers.

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index 0529b215ad18a12480113186106134a9ee860fbf..3269c40d417ba5e4f47091dc4b337b8ab12414b6 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -1,5 +1,5 @@
 /* File names and variables for bison,
 /* File names and variables for bison,

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

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


@@ -15,12 +15,14 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    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.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 #ifndef FILES_H_
 # define FILES_H_
 
 
 #ifndef FILES_H_
 # define FILES_H_
 

+# include "uniqstr.h"
+

 /* File name specified with -o for the output file, or 0 if no -o.  */
 extern char *spec_outfile;
 
 /* File name specified with -o for the output file, or 0 if no -o.  */
 extern char *spec_outfile;
 


@@ -50,28 +52,20 @@ extern FILE *finput;
 extern struct obstack pre_prologue_obstack;
 extern struct obstack post_prologue_obstack;
 
 extern struct obstack pre_prologue_obstack;
 extern struct obstack post_prologue_obstack;
 

-extern char *infile;
-
-void compute_output_file_names PARAMS((void));
+/* The file name as given on the command line.
+   Not named "input_file" because Flex uses this name for an argument,
+   and therefore GCC warns about a name clash. */
+extern uniqstr grammar_file;

 
 

-FILE *xfopen PARAMS ((const char *name, const char *mode));
-int xfclose PARAMS ((FILE *ptr));
+/* The current file name.  Might change with %include, or with #line.  */
+extern uniqstr current_file;

 
 

-const char *skeleton_find PARAMS ((const char *envvar,
-                                  const char *skeleton_name));
+void compute_output_file_names (void);

 
 

-/* Is SUFFIX ending STRING?  */
-int strsuffix (const char* string, const char* suffix);
-
-/* Return a newly allocated string composed of the concatenation of
-   STRING1, and STRING2.  */
-char* stringappend (const char* string1, const char* string2);
+FILE *xfopen (const char *name, const char *mode);
+void xfclose (FILE *ptr);

 
 /* Prefix used to generate output file names.  */
 extern char *short_base_name;
 
 
 /* Prefix used to generate output file names.  */
 extern char *short_base_name;
 

-/* Infix used to generate output file names (i.e., `.tab', or `_tab',
-   or `').  */
-extern char *output_infix;
-

 #endif /* !FILES_H_ */
 #endif /* !FILES_H_ */