tests: portability fixes.

[bison.git] / lib / abitset.c

diff --git a/lib/abitset.c b/lib/abitset.c
index ec5bf6a0f1f5ea18c1536bba90e73af9d44e01ce..5ffba830dc2fab9e7c5570574a7a67412e938f50 100644 (file)
--- a/lib/abitset.c
+++ b/lib/abitset.c
@@ -1,10 +1,13 @@
 /* Array bitsets.
 /* Array bitsets.

-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 2002-2003, 2006, 2009-2012 Free Software Foundation,
+   Inc.
+

    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 

-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -13,13 +16,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 #include "abitset.h"
 #include <stddef.h>
 
 #include "abitset.h"
 #include <stddef.h>


@@ -34,14 +33,13 @@
 
 
 static bitset_bindex
 
 
 static bitset_bindex

-abitset_resize (bitset src ATTRIBUTE_UNUSED,
-               bitset_bindex size ATTRIBUTE_UNUSED)
+abitset_resize (bitset src, bitset_bindex size)

 {
 {

-    if (BITSET_SIZE_ (src) == size)
-       return size;
-

     /* These bitsets have a fixed size.  */
     /* These bitsets have a fixed size.  */

-    abort ();
+    if (BITSET_SIZE_ (src) != size)
+      abort ();
+
+    return size;

 }
 
 /* Find list of up to NUM bits set in BSET starting from and including
 }
 
 /* Find list of up to NUM bits set in BSET starting from and including