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

[bison.git] / lib / lbitset.h

diff --git a/lib/lbitset.h b/lib/lbitset.h
index 078c2eccf7e91877b630444ec64389fa69fc8540..aaad8345ef793e16c420047011778da28f75403d 100644 (file)
--- a/lib/lbitset.h
+++ b/lib/lbitset.h
@@ -1,5 +1,5 @@
 /* Functions to support lbitsets.
-   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
@@ -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
-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 _LBITSET_H
 #define _LBITSET_H
 
-#include "bbitset.h"
+#include "bitset.h"
 
-extern int lbitset_bytes PARAMS ((bitset_bindex));
+extern size_t lbitset_bytes (bitset_bindex);
 
-extern bitset lbitset_init PARAMS ((bitset, bitset_bindex));
+extern bitset lbitset_init (bitset, bitset_bindex);
 
-extern void lbitset_release_memory PARAMS ((void));
+extern void lbitset_release_memory (void);
 
 #endif