build: use Automake 1.14's non-recursive Makefile features

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index c6497ca70c326189f9661e04968c23f245acd7f0..5df578716281ff0bf768a4de6a00c3deb9447a86 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,5 +1,7 @@
 /* Find and resolve or report lookahead conflicts for bison,
 /* Find and resolve or report lookahead conflicts for bison,

-   Copyright (C) 2000, 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
+
+   Copyright (C) 2000-2002, 2004, 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.
 


@@ -37,7 +39,6 @@ void conflicts_update_state_numbers (state_number old_to_new[],
 void conflicts_print (void);
 int conflicts_total_count (void);
 void conflicts_output (FILE *out);
 void conflicts_print (void);
 int conflicts_total_count (void);
 void conflicts_output (FILE *out);

-void conflicts_output_xml (FILE *out, int level);

 void conflicts_free (void);
 
 /* Were there conflicts? */
 void conflicts_free (void);
 
 /* Were there conflicts? */