(MUSCLE_TAB_H_): Was misspelled as MUSCLE_TAB_H_.

[bison.git] / lib / abitset.c

diff --git a/lib/abitset.c b/lib/abitset.c
index c9052f97ef48dd5e1322857df13b107be6718a4a..2d5ca293c7c4d516eafbe7d81ca0b0cfeb709480 100644 (file)
--- a/lib/abitset.c
+++ b/lib/abitset.c
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 */
 
 #ifdef HAVE_CONFIG_H
 */
 
 #ifdef HAVE_CONFIG_H


@@ -22,41 +22,13 @@
 #endif
 
 #include "abitset.h"
 #endif
 
 #include "abitset.h"

+#include <stddef.h>

 #include <stdlib.h>
 #include <string.h>
 
 /* This file implements fixed size bitsets stored as an array
    of words.  Any unused bits in the last word must be zero.  */
 
 #include <stdlib.h>
 #include <string.h>
 
 /* This file implements fixed size bitsets stored as an array
    of words.  Any unused bits in the last word must be zero.  */
 

-typedef struct abitset_struct
-{
-  bitset_bindex n_bits;        /* Number of bits.  */
-  bitset_word words[1];        /* The array of bits.  */
-}
-*abitset;
-
-
-struct bitset_struct
-{
-  struct bbitset_struct b;
-  struct abitset_struct a;
-};
-
-static void abitset_unused_clear PARAMS ((bitset));
-
-static bitset_bindex abitset_small_list PARAMS ((bitset, bitset_bindex *,
-                                                bitset_bindex,
-                                                bitset_bindex *));
-
-static void abitset_set PARAMS ((bitset, bitset_bindex));
-static void abitset_reset PARAMS ((bitset, bitset_bindex));
-static int abitset_test PARAMS ((bitset, bitset_bindex));
-static bitset_bindex abitset_size PARAMS ((bitset));
-static bitset_bindex abitset_list PARAMS ((bitset, bitset_bindex *,
-                                          bitset_bindex, bitset_bindex *));
-static bitset_bindex abitset_list_reverse
-PARAMS ((bitset, bitset_bindex *, bitset_bindex, bitset_bindex *));
-

 #define ABITSET_N_WORDS(N) (((N) + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS)
 #define ABITSET_WORDS(X) ((X)->a.words)
 #define ABITSET_N_BITS(X) ((X)->a.n_bits)
 #define ABITSET_N_WORDS(N) (((N) + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS)
 #define ABITSET_WORDS(X) ((X)->a.words)
 #define ABITSET_N_BITS(X) ((X)->a.n_bits)


@@ -64,8 +36,7 @@ PARAMS ((bitset, bitset_bindex *, bitset_bindex, bitset_bindex *));
 
 /* Return size in bits of bitset SRC.  */
 static bitset_bindex
 
 /* Return size in bits of bitset SRC.  */
 static bitset_bindex

-abitset_size (src)
-     bitset src;
+abitset_size (bitset src)

 {
   return ABITSET_N_BITS (src);
 }
 {
   return ABITSET_N_BITS (src);
 }


@@ -75,11 +46,8 @@ abitset_size (src)
  *NEXT and store in array LIST.  Return with actual number of bits
  found and with *NEXT indicating where search stopped.  */
 static bitset_bindex
  *NEXT and store in array LIST.  Return with actual number of bits
  found and with *NEXT indicating where search stopped.  */
 static bitset_bindex

-abitset_small_list (src, list, num, next)
-     bitset src;
-     bitset_bindex *list;
-     bitset_bindex num;
-     bitset_bindex *next;
+abitset_small_list (bitset src, bitset_bindex *list,
+                   bitset_bindex num, bitset_bindex *next)

 {
   bitset_bindex bitno;
   bitset_bindex count;
 {
   bitset_bindex bitno;
   bitset_bindex count;


@@ -135,9 +103,7 @@ abitset_small_list (src, list, num, next)
 
 /* Set bit BITNO in bitset DST.  */
 static void
 
 /* Set bit BITNO in bitset DST.  */
 static void

-abitset_set (dst, bitno)
-     bitset dst ATTRIBUTE_UNUSED;
-     bitset_bindex bitno ATTRIBUTE_UNUSED;
+abitset_set (bitset dst ATTRIBUTE_UNUSED, bitset_bindex bitno ATTRIBUTE_UNUSED)

 {
   /* This should never occur for abitsets since we should always
      hit the cache.  */
 {
   /* This should never occur for abitsets since we should always
      hit the cache.  */


@@ -147,9 +113,8 @@ abitset_set (dst, bitno)
 
 /* Reset bit BITNO in bitset DST.  */
 static void
 
 /* Reset bit BITNO in bitset DST.  */
 static void

-abitset_reset (dst, bitno)
-     bitset dst ATTRIBUTE_UNUSED;
-     bitset_bindex bitno ATTRIBUTE_UNUSED;
+abitset_reset (bitset dst ATTRIBUTE_UNUSED,
+              bitset_bindex bitno ATTRIBUTE_UNUSED)

 {
   /* This should never occur for abitsets since we should always
      hit the cache.  */
 {
   /* This should never occur for abitsets since we should always
      hit the cache.  */


@@ -159,9 +124,8 @@ abitset_reset (dst, bitno)
 
 /* Test bit BITNO in bitset SRC.  */
 static int
 
 /* Test bit BITNO in bitset SRC.  */
 static int

-abitset_test (src, bitno)
-     bitset src ATTRIBUTE_UNUSED;
-     bitset_bindex bitno ATTRIBUTE_UNUSED;
+abitset_test (bitset src ATTRIBUTE_UNUSED,
+             bitset_bindex bitno ATTRIBUTE_UNUSED)

 {
   /* This should never occur for abitsets since we should always
      hit the cache.  */
 {
   /* This should never occur for abitsets since we should always
      hit the cache.  */


@@ -175,11 +139,8 @@ abitset_test (src, bitno)
    actual number of bits found and with *NEXT indicating where search
    stopped.  */
 static bitset_bindex
    actual number of bits found and with *NEXT indicating where search
    stopped.  */
 static bitset_bindex

-abitset_list_reverse (src, list, num, next)
-     bitset src;
-     bitset_bindex *list;
-     bitset_bindex num;
-     bitset_bindex *next;
+abitset_list_reverse (bitset src, bitset_bindex *list,
+                     bitset_bindex num, bitset_bindex *next)

 {
   bitset_bindex bitno;
   bitset_bindex rbitno;
 {
   bitset_bindex bitno;
   bitset_bindex rbitno;


@@ -238,11 +199,8 @@ abitset_list_reverse (src, list, num, next)
  *NEXT and store in array LIST.  Return with actual number of bits
  found and with *NEXT indicating where search stopped.  */
 static bitset_bindex
  *NEXT and store in array LIST.  Return with actual number of bits
  found and with *NEXT indicating where search stopped.  */
 static bitset_bindex

-abitset_list (src, list, num, next)
-     bitset src;
-     bitset_bindex *list;
-     bitset_bindex num;
-     bitset_bindex *next;
+abitset_list (bitset src, bitset_bindex *list,
+             bitset_bindex num, bitset_bindex *next)

 {
   bitset_bindex bitno;
   bitset_bindex count;
 {
   bitset_bindex bitno;
   bitset_bindex count;


@@ -342,8 +300,7 @@ abitset_list (src, list, num, next)
 
 /* Ensure that any unused bits within the last word are clear.  */
 static inline void
 
 /* Ensure that any unused bits within the last word are clear.  */
 static inline void

-abitset_unused_clear (dst)
-     bitset dst;
+abitset_unused_clear (bitset dst)

 {
   unsigned int last_bit;
 
 {
   unsigned int last_bit;
 


@@ -355,8 +312,7 @@ abitset_unused_clear (dst)
 
 
 static void
 
 
 static void

-abitset_ones (dst)
-     bitset dst;
+abitset_ones (bitset dst)

 {
   bitset_word *dstp = ABITSET_WORDS (dst);
   size_t bytes;
 {
   bitset_word *dstp = ABITSET_WORDS (dst);
   size_t bytes;


@@ -369,8 +325,7 @@ abitset_ones (dst)
 
 
 static void
 
 
 static void

-abitset_zero (dst)
-     bitset dst;
+abitset_zero (bitset dst)

 {
   bitset_word *dstp = ABITSET_WORDS (dst);
   size_t bytes;
 {
   bitset_word *dstp = ABITSET_WORDS (dst);
   size_t bytes;


@@ -382,8 +337,7 @@ abitset_zero (dst)
 
 
 static int
 
 
 static int

-abitset_empty_p (dst)
-     bitset dst;
+abitset_empty_p (bitset dst)

 {
   bitset_windex i;
   bitset_word *dstp = ABITSET_WORDS (dst);
 {
   bitset_windex i;
   bitset_word *dstp = ABITSET_WORDS (dst);


@@ -397,9 +351,7 @@ abitset_empty_p (dst)
 
 
 static void
 
 
 static void

-abitset_copy1 (dst, src)
-     bitset dst;
-     bitset src;
+abitset_copy1 (bitset dst, bitset src)

 {
   bitset_word *srcp = ABITSET_WORDS (src);
   bitset_word *dstp = ABITSET_WORDS (dst);
 {
   bitset_word *srcp = ABITSET_WORDS (src);
   bitset_word *dstp = ABITSET_WORDS (dst);


@@ -412,9 +364,7 @@ abitset_copy1 (dst, src)
 
 
 static void
 
 
 static void

-abitset_not (dst, src)
-     bitset dst;
-     bitset src;
+abitset_not (bitset dst, bitset src)

 {
   bitset_windex i;
   bitset_word *srcp = ABITSET_WORDS (src);
 {
   bitset_windex i;
   bitset_word *srcp = ABITSET_WORDS (src);


@@ -426,11 +376,9 @@ abitset_not (dst, src)
   abitset_unused_clear (dst);
 }
 
   abitset_unused_clear (dst);
 }
 

- 
+

 static int
 static int

-abitset_equal_p (dst, src)
-     bitset dst;
-     bitset src;
+abitset_equal_p (bitset dst, bitset src)

 {
   bitset_windex i;
   bitset_word *srcp = ABITSET_WORDS (src);
 {
   bitset_windex i;
   bitset_word *srcp = ABITSET_WORDS (src);


@@ -445,15 +393,13 @@ abitset_equal_p (dst, src)
 
 
 static int
 
 
 static int

-abitset_subset_p (dst, src)
-     bitset dst;
-     bitset src;
+abitset_subset_p (bitset dst, bitset src)

 {
   bitset_windex i;
   bitset_word *srcp = ABITSET_WORDS (src);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;
 {
   bitset_windex i;
   bitset_word *srcp = ABITSET_WORDS (src);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;

-  
+

   for (i = 0; i < size; i++, dstp++, srcp++)
       if (*dstp != (*srcp | *dstp))
          return 0;
   for (i = 0; i < size; i++, dstp++, srcp++)
       if (*dstp != (*srcp | *dstp))
          return 0;


@@ -462,9 +408,7 @@ abitset_subset_p (dst, src)
 
 
 static int
 
 
 static int

-abitset_disjoint_p (dst, src)
-     bitset dst;
-     bitset src;
+abitset_disjoint_p (bitset dst, bitset src)

 {
   bitset_windex i;
   bitset_word *srcp = ABITSET_WORDS (src);
 {
   bitset_windex i;
   bitset_word *srcp = ABITSET_WORDS (src);


@@ -480,10 +424,7 @@ abitset_disjoint_p (dst, src)
 
 
 static void
 
 
 static void

-abitset_and (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
+abitset_and (bitset dst, bitset src1, bitset src2)

 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);
 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);


@@ -497,10 +438,7 @@ abitset_and (dst, src1, src2)
 
 
 static int
 
 
 static int

-abitset_and_cmp (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
+abitset_and_cmp (bitset dst, bitset src1, bitset src2)

 {
   bitset_windex i;
   int changed = 0;
 {
   bitset_windex i;
   int changed = 0;


@@ -512,7 +450,7 @@ abitset_and_cmp (dst, src1, src2)
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = *src1p++ & *src2p++;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = *src1p++ & *src2p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -524,10 +462,7 @@ abitset_and_cmp (dst, src1, src2)
 
 
 static void
 
 
 static void

-abitset_andn (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
+abitset_andn (bitset dst, bitset src1, bitset src2)

 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);
 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);


@@ -541,10 +476,7 @@ abitset_andn (dst, src1, src2)
 
 
 static int
 
 
 static int

-abitset_andn_cmp (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
+abitset_andn_cmp (bitset dst, bitset src1, bitset src2)

 {
   bitset_windex i;
   int changed = 0;
 {
   bitset_windex i;
   int changed = 0;


@@ -552,11 +484,11 @@ abitset_andn_cmp (dst, src1, src2)
   bitset_word *src2p = ABITSET_WORDS (src2);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;
   bitset_word *src2p = ABITSET_WORDS (src2);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;

-  
+

   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = *src1p++ & ~(*src2p++);
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = *src1p++ & ~(*src2p++);

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -568,10 +500,7 @@ abitset_andn_cmp (dst, src1, src2)
 
 
 static void
 
 
 static void

-abitset_or (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
+abitset_or (bitset dst, bitset src1, bitset src2)

 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);
 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);


@@ -585,10 +514,7 @@ abitset_or (dst, src1, src2)
 
 
 static int
 
 
 static int

-abitset_or_cmp (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
+abitset_or_cmp (bitset dst, bitset src1, bitset src2)

 {
   bitset_windex i;
   int changed = 0;
 {
   bitset_windex i;
   int changed = 0;


@@ -600,7 +526,7 @@ abitset_or_cmp (dst, src1, src2)
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = *src1p++ | *src2p++;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = *src1p++ | *src2p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -612,10 +538,7 @@ abitset_or_cmp (dst, src1, src2)
 
 
 static void
 
 
 static void

-abitset_xor (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
+abitset_xor (bitset dst, bitset src1, bitset src2)

 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);
 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);


@@ -629,10 +552,7 @@ abitset_xor (dst, src1, src2)
 
 
 static int
 
 
 static int

-abitset_xor_cmp (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
+abitset_xor_cmp (bitset dst, bitset src1, bitset src2)

 {
   bitset_windex i;
   int changed = 0;
 {
   bitset_windex i;
   int changed = 0;


@@ -644,7 +564,7 @@ abitset_xor_cmp (dst, src1, src2)
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = *src1p++ ^ *src2p++;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = *src1p++ ^ *src2p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -656,11 +576,7 @@ abitset_xor_cmp (dst, src1, src2)
 
 
 static void
 
 
 static void

-abitset_and_or (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+abitset_and_or (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);
 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);


@@ -668,18 +584,14 @@ abitset_and_or (dst, src1, src2, src3)
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;

-  
+

   for (i = 0; i < size; i++)
       *dstp++ = (*src1p++ & *src2p++) | *src3p++;
 }
 
 
 static int
   for (i = 0; i < size; i++)
       *dstp++ = (*src1p++ & *src2p++) | *src3p++;
 }
 
 
 static int

-abitset_and_or_cmp (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+abitset_and_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   bitset_windex i;
   int changed = 0;
 {
   bitset_windex i;
   int changed = 0;


@@ -688,11 +600,11 @@ abitset_and_or_cmp (dst, src1, src2, src3)
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;

-  
+

   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ & *src2p++) | *src3p++;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ & *src2p++) | *src3p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -704,11 +616,7 @@ abitset_and_or_cmp (dst, src1, src2, src3)
 
 
 static void
 
 
 static void

-abitset_andn_or (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+abitset_andn_or (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);
 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);


@@ -716,18 +624,14 @@ abitset_andn_or (dst, src1, src2, src3)
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;

-  
+

   for (i = 0; i < size; i++)
       *dstp++ = (*src1p++ & ~(*src2p++)) | *src3p++;
 }
 
 
 static int
   for (i = 0; i < size; i++)
       *dstp++ = (*src1p++ & ~(*src2p++)) | *src3p++;
 }
 
 
 static int

-abitset_andn_or_cmp (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+abitset_andn_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   bitset_windex i;
   int changed = 0;
 {
   bitset_windex i;
   int changed = 0;


@@ -736,11 +640,11 @@ abitset_andn_or_cmp (dst, src1, src2, src3)
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;

-  
+

   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ & ~(*src2p++)) | *src3p++;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ & ~(*src2p++)) | *src3p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -752,11 +656,7 @@ abitset_andn_or_cmp (dst, src1, src2, src3)
 
 
 static void
 
 
 static void

-abitset_or_and (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+abitset_or_and (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);
 {
   bitset_windex i;
   bitset_word *src1p = ABITSET_WORDS (src1);


@@ -764,18 +664,14 @@ abitset_or_and (dst, src1, src2, src3)
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;

-  
+

   for (i = 0; i < size; i++)
       *dstp++ = (*src1p++ | *src2p++) & *src3p++;
 }
 
 
 static int
   for (i = 0; i < size; i++)
       *dstp++ = (*src1p++ | *src2p++) & *src3p++;
 }
 
 
 static int

-abitset_or_and_cmp (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+abitset_or_and_cmp (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   bitset_windex i;
   int changed = 0;
 {
   bitset_windex i;
   int changed = 0;


@@ -784,11 +680,11 @@ abitset_or_and_cmp (dst, src1, src2, src3)
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;
   bitset_word *src3p = ABITSET_WORDS (src3);
   bitset_word *dstp = ABITSET_WORDS (dst);
   bitset_windex size = dst->b.csize;

-  
+

   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ | *src2p++) & *src3p++;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ | *src2p++) & *src3p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -799,10 +695,8 @@ abitset_or_and_cmp (dst, src1, src2, src3)
 }
 
 
 }
 
 

-void
-abitset_copy (dst, src)
-     bitset dst;
-     bitset src;
+static void
+abitset_copy (bitset dst, bitset src)

 {
   if (BITSET_COMPATIBLE_ (dst, src))
       abitset_copy1 (dst, src);
 {
   if (BITSET_COMPATIBLE_ (dst, src))
       abitset_copy1 (dst, src);


@@ -886,22 +780,31 @@ struct bitset_vtable abitset_vtable = {
 
 
 size_t
 
 
 size_t

-abitset_bytes (n_bits)
-     bitset_bindex n_bits;
+abitset_bytes (bitset_bindex n_bits)

 {
   bitset_windex size;
   size_t bytes;
 {
   bitset_windex size;
   size_t bytes;

+  size_t header_size = offsetof (union bitset_union, a.words);
+  struct bitset_align_struct { char a; union bitset_union b; };
+  size_t bitset_alignment = offsetof (struct bitset_align_struct, b);

 
   size = ABITSET_N_WORDS (n_bits);
 
   size = ABITSET_N_WORDS (n_bits);

-  bytes = size * sizeof (bitset_word);
-  return sizeof (struct bitset_struct) + bytes - sizeof (bitset_word);
+  bytes = header_size + size * sizeof (bitset_word);
+
+  /* Align the size properly for a vector of abitset objects.  */
+  if (header_size % bitset_alignment != 0
+      || sizeof (bitset_word) % bitset_alignment != 0)
+    {
+      bytes += bitset_alignment - 1;
+      bytes -= bytes % bitset_alignment;
+    }
+
+  return bytes;

 }
 
 
 bitset
 }
 
 
 bitset

-abitset_init (bset, n_bits)
-     bitset bset;
-     bitset_bindex n_bits;
+abitset_init (bitset bset, bitset_bindex n_bits)

 {
   bitset_windex size;
 
 {
   bitset_windex size;