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 5b481dbf747174d8d6bcb4ab23b637d2c0bd4689..dc602734a0169baeb2035693bd6beb4c4f7f2f26 100644 (file)
--- a/lib/ebitset.h
+++ b/lib/ebitset.h
@@ -1,5 +1,5 @@
 /* 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
@@ -14,45 +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 _EBITSET_H
 #define _EBITSET_H
 
-#include "bitset-int.h"
-
-/* Number of words to use for each element.  */
-#ifndef EBITSET_ELT_WORDS
-#define EBITSET_ELT_WORDS 2
-#endif
-
-/* Number of bits stored in each element.  */
-#define EBITSET_ELT_BITS \
-  ((unsigned) (EBITSET_ELT_WORDS * BITSET_WORD_BITS))
-
-/* Ebitset element.  We use an array of bits.  */
-typedef struct ebitset_elt_struct
-{
-  union
-  {
-    bitset_word words[EBITSET_ELT_WORDS]; /* Bits that are set.  */
-    struct ebitset_elt_struct *next;
-  } u;
-} ebitset_elt;
-
-
-typedef ebitset_elt *ebitset_elts;
-
-/* Head of ebitset linked list.  */
-typedef struct ebitset_struct
-{
-  unsigned int size;           /* Number of elements.  */
-  ebitset_elts *elts;          /* Expanding array of pointers to elements.  */
-} *ebitset;
+#include "bitset.h"
 
+extern size_t ebitset_bytes (bitset_bindex);
 
-extern int ebitset_bytes PARAMS ((bitset_bindex));
+extern bitset ebitset_init (bitset, bitset_bindex);
 
-extern void ebitset_release_memory PARAMS ((void));
+extern void ebitset_release_memory (void);
 
 #endif