* tests/regression.at (Unresolved SR Conflicts):

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index 573ea3ce54cc812dafcf2b36c776b59b56144f3e..5f02dca136fe833ef0283abf18e6157d696661d4 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -52,9 +52,6 @@ extern struct obstack action_obstack;
 /* If semantic parser, output a .h file that defines YYSTYPE... */
 extern struct obstack attrs_obstack;
 
 /* If semantic parser, output a .h file that defines YYSTYPE... */
 extern struct obstack attrs_obstack;
 

-/* ... and output yyguard, containing all the guard code. */
-extern struct obstack guard_obstack;
-

 /* The verbose output. */
 extern struct obstack output_obstack;
 
 /* The verbose output. */
 extern struct obstack output_obstack;
 


@@ -62,13 +59,12 @@ extern char *infile;
 extern char *attrsfile;
 
 void compute_output_file_names PARAMS((void));
 extern char *attrsfile;
 
 void compute_output_file_names PARAMS((void));

-void output_files PARAMS((void));

 
 FILE *xfopen PARAMS ((const char *name, const char *mode));
 int xfclose PARAMS ((FILE *ptr));
 
 /* Compute the double inclusion guard's name. */
 
 FILE *xfopen PARAMS ((const char *name, const char *mode));
 int xfclose PARAMS ((FILE *ptr));
 
 /* Compute the double inclusion guard's name. */

-char * compute_header_macro PARAMS ((void));
+char *compute_header_macro PARAMS ((void));

 
 const char *skeleton_find PARAMS ((const char *envvar,
                                   const char *skeleton_name));
 
 const char *skeleton_find PARAMS ((const char *envvar,
                                   const char *skeleton_name));