Hi Tys, On Tue, 5 Apr 2011, Tys Lefering wrote:
> GPL_version > src/print-xml.c:9: the Free Software Foundation; either version 2, > or (at your option) > src/print-xml.h:9: the Free Software Foundation; either version 2, > or (at your option) > > It looks like the print-xml files headers need update. Thanks. I pushed the patch below to branch-2.5 and master. > and in flex-scanner.h changed this: > yy_size_t /* int */ FLEX_PREFIX (get_leng) (void); Can you explain that one a bit more? For me, flex 2.5.35 defines that function with a return type of int, so our flex-scanner.h is correct. What flex are you using? >From fea2d6b0975a5b92dfc13b72e2b1d147e8d4a1b6 Mon Sep 17 00:00:00 2001 From: Joel E. Denny <[email protected]> Date: Sat, 9 Apr 2011 18:24:55 -0400 Subject: [PATCH] Fix missing updates to GPLv3. Reported by Tys Lefering at <http://lists.gnu.org/archive/html/bison-patches/2011-04/msg00000.html>. * src/print-xml.c, src/print-xml.h: In these files. --- ChangeLog | 7 +++++++ src/print-xml.c | 12 +++++------- src/print-xml.h | 12 +++++------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27c6a8d..0a95d2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-04-09 Joel E. Denny <[email protected]> + + Fix missing updates to GPLv3. + Reported by Tys Lefering at + <http://lists.gnu.org/archive/html/bison-patches/2011-04/msg00000.html>. + * src/print-xml.c, src/print-xml.h: In these files. + 2011-03-27 Joel E. Denny <[email protected]> Add -Wconflicts-sr and -Wconflicts-rr. diff --git a/src/print-xml.c b/src/print-xml.c index 1dc0268..0aade53 100644 --- a/src/print-xml.c +++ b/src/print-xml.c @@ -4,20 +4,18 @@ This file is part of Bison, the GNU Compiler Compiler. - Bison 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. + 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, + 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, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include "system.h" diff --git a/src/print-xml.h b/src/print-xml.h index 5285473..1f1cb3d 100644 --- a/src/print-xml.h +++ b/src/print-xml.h @@ -4,20 +4,18 @@ This file is part of Bison, the GNU Compiler Compiler. - Bison 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. + 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, + 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, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef PRINT_XML_H_ # define PRINT_XML_H_ -- 1.7.0.4
