Merge remote-tracking branch 'origin/maint'

[bison.git] / lib / bitsetv-print.c

diff --git a/lib/bitsetv-print.c b/lib/bitsetv-print.c
index 5a624f596b7bbed0e1211d55b5fe06c7d9e0df9a..3d4f8c607ea2268d5385ffbec49a97206726be44 100644 (file)
--- a/lib/bitsetv-print.c
+++ b/lib/bitsetv-print.c
@@ -1,30 +1,27 @@
 /* Bitset vectors.
 /* Bitset vectors.

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

 
 

-This file is part of Bison.
+   Copyright (C) 2001-2002, 2004, 2006, 2009-2012 Free Software
+   Foundation, Inc.

 
 

-Bison is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-Bison is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

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

 
 

-#include <stdlib.h>

 #include "bitsetv-print.h"
 
 #include "bitsetv-print.h"
 

+#include <stdlib.h>
+

 /*--------------------------------------------------------.
 | Display the MATRIX array of SIZE bitsets of size SIZE.  |
 `--------------------------------------------------------*/
 /*--------------------------------------------------------.
 | Display the MATRIX array of SIZE bitsets of size SIZE.  |
 `--------------------------------------------------------*/


@@ -59,7 +56,7 @@ bitsetv_matrix_dump (FILE * out, const char *title, bitsetv bset)
     {
       fprintf (out, "%2lu|", (unsigned long int) i);
       for (j = 0; j < hsize; ++j)
     {
       fprintf (out, "%2lu|", (unsigned long int) i);
       for (j = 0; j < hsize; ++j)

-       fputs (bitset_test (bset[i], j) ? "1" : " ", out);
+        fputs (bitset_test (bset[i], j) ? "1" : " ", out);

       fputs ("|\n", out);
     }
 
       fputs ("|\n", out);
     }