Change %merge result type clash warnings to errors. Discussed at

[bison.git] / lib / ebitset.h

diff --git a/lib/ebitset.h b/lib/ebitset.h
index b41485f2c0d186f65c078d8aa6ba00cac3377571..dc602734a0169baeb2035693bd6beb4c4f7f2f26 100644 (file)
--- a/lib/ebitset.h
+++ b/lib/ebitset.h
@@ -1,5 +1,5 @@
 /* Functions to support ebitsets.
 /* Functions to support ebitsets.

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.

    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
 This program is free software; you can redistribute it and/or modify
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
 This program is free software; you can redistribute it and/or modify


@@ -14,17 +14,17 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

 
 #ifndef _EBITSET_H
 #define _EBITSET_H
 
 
 #ifndef _EBITSET_H
 #define _EBITSET_H
 

-#include "bbitset.h"
+#include "bitset.h"

 
 

-extern int ebitset_bytes PARAMS ((bitset_bindex));
+extern size_t ebitset_bytes (bitset_bindex);

 
 

-extern bitset ebitset_init PARAMS ((bitset, bitset_bindex));
+extern bitset ebitset_init (bitset, bitset_bindex);

 
 

-extern void ebitset_release_memory PARAMS ((void));
+extern void ebitset_release_memory (void);

 
 #endif
 
 #endif