Merge in branch-1_29.

This commit is contained in:
Akim Demaille
2001-10-04 14:55:21 +00:00
parent 0150aabe35
commit 342b8b6e21
59 changed files with 2212 additions and 1586 deletions

View File

@@ -22,10 +22,10 @@
# define CONFLICTS_H_
# include "state.h"
void initialize_conflicts PARAMS ((void));
void print_conflicts PARAMS ((void));
void solve_conflicts PARAMS ((void));
void print_conflicts PARAMS ((FILE *out));
void print_reductions PARAMS ((int));
void finalize_conflicts PARAMS ((void));
void free_conflicts PARAMS ((void));
/* Were there conflicts? */
extern int any_conflicts;