This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.15-351-gc524201


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  c524201ab0aee9e3228c43b5f53cc6364f548f8e (commit)
       via  57e128f551282a80916180ed18ff307e6eed5329 (commit)
       via  7b6235f261b1dbd9a2a639d5ca98cfec9584886f (commit)
       via  547b5e30dc0828f20351be14d8db160870be72ee (commit)
      from  4e234f5d1b9247724453c4899239fb514c24779d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c524201ab0aee9e3228c43b5f53cc6364f548f8e

commit c524201ab0aee9e3228c43b5f53cc6364f548f8e
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sat Mar 10 00:44:13 2012 +0000

    Replace FSF snail mail address with URL in miscellaneous files.

diff --git a/ChangeLog b/ChangeLog
index bced29e..b95bb9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
 2012-03-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	[BZ #13673]
+	* posix/bug-regex33.c: Replace FSF snail mail address with URL.
+	* stdio-common/bug-vfprintf-nargs.c: Likewise.
+	* sysdeps/i386/crti.S: Likewise.
+	* sysdeps/i386/crtn.S: Likewise.
+	* sysdeps/powerpc/powerpc32/crti.S: Likewise.
+	* sysdeps/powerpc/powerpc32/crtn.S: Likewise.
+	* sysdeps/powerpc/powerpc64/crti.S: Likewise.
+	* sysdeps/powerpc/powerpc64/crtn.S: Likewise.
+	* sysdeps/sh/crti.S: Likewise.
+	* sysdeps/sh/crtn.S: Likewise.
+	* sysdeps/x86_64/fpu/e_expf.S: Likewise.
+
+	[BZ #13673]
 	* locale/programs/charmap-kw.gperf: Replace FSF snail mail address
 	with URL.
 	* locale/programs/locfile-kw.gperf: Likewise.
diff --git a/NEWS b/NEWS
index fd36632..4f8938e 100644
--- a/NEWS
+++ b/NEWS
@@ -13,8 +13,8 @@ Version 2.16
   5077, 5461, 5805, 5993, 6884, 6907, 6911, 9739, 9902, 10110, 10135, 10140,
   10210, 10545, 10716, 11174, 11322, 11365, 11494, 12047, 13058, 13525,
   13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551,
-  13552, 13553, 13555, 13559, 13583, 13618, 13637, 13656, 13695, 13704,
-  13706, 13726, 13738, 13786, 13792, 13806
+  13552, 13553, 13555, 13559, 13583, 13618, 13637, 13656, 13673, 13695,
+  13704, 13706, 13726, 13738, 13786, 13792, 13806
 
 * ISO C11 support:
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 3f70b0a..34a2492 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	[BZ #13673]
+	* pt-crti.S: Replace FSF snail mail address with URL.
+
 2012-03-09  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/pthread/pthread.h (__need_clockid_t, __need_timespec):
diff --git a/nptl/pt-crti.S b/nptl/pt-crti.S
index 3ea359d..4c5cddd 100644
--- a/nptl/pt-crti.S
+++ b/nptl/pt-crti.S
@@ -30,9 +30,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* Arrange for __pthread_initialize_minimal_internal to be called at
    libpthread startup, instead of conditionally calling
diff --git a/posix/bug-regex33.c b/posix/bug-regex33.c
index c0c94aa..f78b354 100644
--- a/posix/bug-regex33.c
+++ b/posix/bug-regex33.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #define _GNU_SOURCE 1
 #include <locale.h>
diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
index 13c66c0..4f62106 100644
--- a/stdio-common/bug-vfprintf-nargs.c
+++ b/stdio-common/bug-vfprintf-nargs.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sysdeps/i386/crti.S b/sysdeps/i386/crti.S
index dfec2cb..2ecc40d 100644
--- a/sysdeps/i386/crti.S
+++ b/sysdeps/i386/crti.S
@@ -30,9 +30,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* crti.S puts a function prologue at the beginning of the .init and
    .fini sections and defines global symbols for those addresses, so
diff --git a/sysdeps/i386/crtn.S b/sysdeps/i386/crtn.S
index 2ea2a38..ad038fd 100644
--- a/sysdeps/i386/crtn.S
+++ b/sysdeps/i386/crtn.S
@@ -30,9 +30,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* crtn.S puts function epilogues in the .init and .fini sections
    corresponding to the prologues in crti.S. */
diff --git a/sysdeps/powerpc/powerpc32/crti.S b/sysdeps/powerpc/powerpc32/crti.S
index 72e9cf4..b0e92fa 100644
--- a/sysdeps/powerpc/powerpc32/crti.S
+++ b/sysdeps/powerpc/powerpc32/crti.S
@@ -30,9 +30,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* crti.S puts a function prologue at the beginning of the .init and
    .fini sections and defines global symbols for those addresses, so
diff --git a/sysdeps/powerpc/powerpc32/crtn.S b/sysdeps/powerpc/powerpc32/crtn.S
index af690c1..62a31df 100644
--- a/sysdeps/powerpc/powerpc32/crtn.S
+++ b/sysdeps/powerpc/powerpc32/crtn.S
@@ -30,9 +30,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* crtn.S puts function epilogues in the .init and .fini sections
    corresponding to the prologues in crti.S. */
diff --git a/sysdeps/powerpc/powerpc64/crti.S b/sysdeps/powerpc/powerpc64/crti.S
index bce256d..96726b4 100644
--- a/sysdeps/powerpc/powerpc64/crti.S
+++ b/sysdeps/powerpc/powerpc64/crti.S
@@ -30,9 +30,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* crti.S puts a function prologue at the beginning of the .init and
    .fini sections and defines global symbols for those addresses, so
diff --git a/sysdeps/powerpc/powerpc64/crtn.S b/sysdeps/powerpc/powerpc64/crtn.S
index 52d46b3..39f5c14 100644
--- a/sysdeps/powerpc/powerpc64/crtn.S
+++ b/sysdeps/powerpc/powerpc64/crtn.S
@@ -30,9 +30,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* crtn.S puts function epilogues in the .init and .fini sections
    corresponding to the prologues in crti.S. */
diff --git a/sysdeps/sh/crti.S b/sysdeps/sh/crti.S
index 62b6c1c..c390485 100644
--- a/sysdeps/sh/crti.S
+++ b/sysdeps/sh/crti.S
@@ -30,9 +30,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* crti.S puts a function prologue at the beginning of the .init and
    .fini sections and defines global symbols for those addresses, so
diff --git a/sysdeps/sh/crtn.S b/sysdeps/sh/crtn.S
index 1b52770..78537e7 100644
--- a/sysdeps/sh/crtn.S
+++ b/sysdeps/sh/crtn.S
@@ -30,9 +30,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* crtn.S puts function epilogues in the .init and .fini sections
    corresponding to the prologues in crti.S. */
diff --git a/sysdeps/x86_64/fpu/e_expf.S b/sysdeps/x86_64/fpu/e_expf.S
index f1ce285..340a1c2 100644
--- a/sysdeps/x86_64/fpu/e_expf.S
+++ b/sysdeps/x86_64/fpu/e_expf.S
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
 

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=57e128f551282a80916180ed18ff307e6eed5329

commit 57e128f551282a80916180ed18ff307e6eed5329
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sat Mar 10 00:44:00 2012 +0000

    Replace FSF snail mail address with URL in localedata.

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index c5afba1..8567c6c 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	[BZ #13673]
+	Replace FSF snail mail address with URLs, as per GNU coding standards.
+
 2012-03-07  Ulrich Drepper  <drepper@gmail.com>
 
 	* Makefile (distribute): Remove variable.
diff --git a/localedata/locales/br_FR@euro b/localedata/locales/br_FR@euro
index 62b1da9..a28fcf6 100644
--- a/localedata/locales/br_FR@euro
+++ b/localedata/locales/br_FR@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Breton locale for France with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro
index 50609df..b3e6ecb 100644
--- a/localedata/locales/ca_ES@euro
+++ b/localedata/locales/ca_ES@euro
@@ -16,7 +16,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Catalan locale for Catalonia with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 2f25e9a..12fe500 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -107,7 +107,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "Czech locale for the Czech Republic"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/de_BE@euro b/localedata/locales/de_BE@euro
index e5f02dc..d9c4188 100644
--- a/localedata/locales/de_BE@euro
+++ b/localedata/locales/de_BE@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "German locale for Belgium with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index eac517a..32cbd76 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "German locale for Germany"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/de_DE@euro b/localedata/locales/de_DE@euro
index d639e3f..7e9c97a 100644
--- a/localedata/locales/de_DE@euro
+++ b/localedata/locales/de_DE@euro
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "German locale for Germany with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/de_LU@euro b/localedata/locales/de_LU@euro
index 3c41ffb..caff758 100644
--- a/localedata/locales/de_LU@euro
+++ b/localedata/locales/de_LU@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "German locale for Luxemburg with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/el_GR@euro b/localedata/locales/el_GR@euro
index bd1f6be..2a37cf6 100644
--- a/localedata/locales/el_GR@euro
+++ b/localedata/locales/el_GR@euro
@@ -4,7 +4,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "Greek locale for Greece with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG
index f39c410..b724eac 100644
--- a/localedata/locales/en_AG
+++ b/localedata/locales/en_AG
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "English language locale for Antigua and Barbuda"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/en_IE@euro b/localedata/locales/en_IE@euro
index dc429d7..7f5d518 100644
--- a/localedata/locales/en_IE@euro
+++ b/localedata/locales/en_IE@euro
@@ -14,7 +14,7 @@ comment_char  %
 LC_IDENTIFICATION
 title      "English locale for Ireland with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index a41f5bc..3560c57 100644
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "English locale for the USA"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index f998c86..d7be7f8 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Costa Rica"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_ES@euro b/localedata/locales/es_ES@euro
index 1d81e83..721738e 100644
--- a/localedata/locales/es_ES@euro
+++ b/localedata/locales/es_ES@euro
@@ -15,7 +15,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Spain with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI
index 207f2da..7371532 100644
--- a/localedata/locales/es_NI
+++ b/localedata/locales/es_NI
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Nicaragua"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR
index 53496d4..b15ca45 100644
--- a/localedata/locales/es_PR
+++ b/localedata/locales/es_PR
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Spanish locale for Puerto Rico"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/eu_ES@euro b/localedata/locales/eu_ES@euro
index f88fce4..356bf62 100644
--- a/localedata/locales/eu_ES@euro
+++ b/localedata/locales/eu_ES@euro
@@ -15,7 +15,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Basque language locale for Spain with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/fi_FI@euro b/localedata/locales/fi_FI@euro
index 836322b..39c51d6 100644
--- a/localedata/locales/fi_FI@euro
+++ b/localedata/locales/fi_FI@euro
@@ -15,7 +15,7 @@ comment_char    %
 LC_IDENTIFICATION
 title      "Finnish locale for Finland with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/fr_BE@euro b/localedata/locales/fr_BE@euro
index 51968f8..08f9298 100644
--- a/localedata/locales/fr_BE@euro
+++ b/localedata/locales/fr_BE@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "French locale for Belgium with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/fr_FR@euro b/localedata/locales/fr_FR@euro
index 63f805a..5f858fd 100644
--- a/localedata/locales/fr_FR@euro
+++ b/localedata/locales/fr_FR@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "French locale for France with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
diff --git a/localedata/locales/fr_LU@euro b/localedata/locales/fr_LU@euro
index 3466e40..014ff1d 100644
--- a/localedata/locales/fr_LU@euro
+++ b/localedata/locales/fr_LU@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "French locale for Luxemburg with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL
index a787e78..b0cde4b 100644
--- a/localedata/locales/fy_NL
+++ b/localedata/locales/fy_NL
@@ -13,7 +13,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Frisian locale for the Netherlands"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/ga_IE@euro b/localedata/locales/ga_IE@euro
index c7a9299..c9474a5 100644
--- a/localedata/locales/ga_IE@euro
+++ b/localedata/locales/ga_IE@euro
@@ -13,7 +13,7 @@ comment_char  %
 LC_IDENTIFICATION
 title      "Irish locale for Ireland with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/gl_ES@euro b/localedata/locales/gl_ES@euro
index b521451..534a092 100644
--- a/localedata/locales/gl_ES@euro
+++ b/localedata/locales/gl_ES@euro
@@ -15,7 +15,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Galician locale for Spain with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/it_IT@euro b/localedata/locales/it_IT@euro
index e995eb3..e34a8d5 100644
--- a/localedata/locales/it_IT@euro
+++ b/localedata/locales/it_IT@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Italian locale for Italy with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/nl_AW b/localedata/locales/nl_AW
index 9161977..e9fe8f8 100644
--- a/localedata/locales/nl_AW
+++ b/localedata/locales/nl_AW
@@ -6,7 +6,7 @@ comment_char %
 LC_IDENTIFICATION
 title      "Dutch language locale for Aruba"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/nl_BE@euro b/localedata/locales/nl_BE@euro
index 333305c..413e8de 100644
--- a/localedata/locales/nl_BE@euro
+++ b/localedata/locales/nl_BE@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Dutch locale for Belgium with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/nl_NL@euro b/localedata/locales/nl_NL@euro
index 98ee41c..b0cc689 100644
--- a/localedata/locales/nl_NL@euro
+++ b/localedata/locales/nl_NL@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Dutch locale for the Netherlands with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/pt_PT@euro b/localedata/locales/pt_PT@euro
index 658976a..f0a5c27 100644
--- a/localedata/locales/pt_PT@euro
+++ b/localedata/locales/pt_PT@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Portuguese locale for Portugal with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/sv_FI@euro b/localedata/locales/sv_FI@euro
index 095ef67..f69e5b5 100644
--- a/localedata/locales/sv_FI@euro
+++ b/localedata/locales/sv_FI@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Swedish locale for Finland with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY
index bc63829..daeffc1 100644
--- a/localedata/locales/tr_CY
+++ b/localedata/locales/tr_CY
@@ -16,7 +16,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Turkish language locale for Cyprus"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""
diff --git a/localedata/locales/wa_BE@euro b/localedata/locales/wa_BE@euro
index a88b906..78c6b6a 100644
--- a/localedata/locales/wa_BE@euro
+++ b/localedata/locales/wa_BE@euro
@@ -14,7 +14,7 @@ escape_char  /
 LC_IDENTIFICATION
 title      "Walloon locale for Belgium with Euro"
 source     "Free Software Foundation, Inc."
-address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+address    "http:////www.gnu.org//software//libc//";
 contact    ""
 email      "bug-glibc-locales@gnu.org"
 tel        ""

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7b6235f261b1dbd9a2a639d5ca98cfec9584886f

commit 7b6235f261b1dbd9a2a639d5ca98cfec9584886f
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sat Mar 10 00:43:12 2012 +0000

    Replace FSF snail mail address with URL in gperf input.

diff --git a/ChangeLog b/ChangeLog
index 8ce6438..bced29e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2012-03-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	[BZ #13673]
+	* locale/programs/charmap-kw.gperf: Replace FSF snail mail address
+	with URL.
+	* locale/programs/locfile-kw.gperf: Likewise.
+	* locale/programs/charmap-kw.h: Regenerated.
+	* locale/programs/locfile-kw.h: Likewise.
+
+	[BZ #13673]
 	* intl/plural.y: Replace FSF snail mail address with URL.
 	* intl/plural.c: Regenerated.
 
diff --git a/locale/programs/charmap-kw.gperf b/locale/programs/charmap-kw.gperf
index 03fea94..4d5aecb 100644
--- a/locale/programs/charmap-kw.gperf
+++ b/locale/programs/charmap-kw.gperf
@@ -14,8 +14,8 @@
    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.  */
+   along with this program; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <string.h>
 
diff --git a/locale/programs/charmap-kw.h b/locale/programs/charmap-kw.h
index 8ad6421..8a8e700 100644
--- a/locale/programs/charmap-kw.h
+++ b/locale/programs/charmap-kw.h
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.1 */
+/* ANSI-C code produced by gperf version 3.0.4 */
 /* Command-line: gperf -acCgopt -k'1,2,5,9,$' -L ANSI-C -N charmap_hash charmap-kw.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -45,13 +45,13 @@
    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.  */
+   along with this program; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <string.h>
 
 #include "locfile-token.h"
-#line 23 "charmap-kw.gperf"
+#line 24 "charmap-kw.gperf"
 struct keyword_t ;
 
 #define TOTAL_KEYWORDS 17
@@ -127,6 +127,9 @@ hash (register const char *str, register unsigned int len)
 
 #ifdef __GNUC__
 __inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
 #endif
 const struct keyword_t *
 charmap_hash (register const char *str, register unsigned int len)
@@ -134,45 +137,45 @@ charmap_hash (register const char *str, register unsigned int len)
   static const struct keyword_t wordlist[] =
     {
       {""}, {""}, {""},
-#line 38 "charmap-kw.gperf"
+#line 39 "charmap-kw.gperf"
       {"END",             tok_end,             0},
       {""},
-#line 39 "charmap-kw.gperf"
+#line 40 "charmap-kw.gperf"
       {"WIDTH",           tok_width,           0},
-#line 34 "charmap-kw.gperf"
+#line 35 "charmap-kw.gperf"
       {"escseq",          tok_escseq,          1},
-#line 36 "charmap-kw.gperf"
+#line 37 "charmap-kw.gperf"
       {"include",         tok_include,         1},
       {""}, {""},
-#line 27 "charmap-kw.gperf"
-      {"mb_cur_min",      tok_mb_cur_min,      1},
 #line 28 "charmap-kw.gperf"
-      {"escape_char",     tok_escape_char,     1},
+      {"mb_cur_min",      tok_mb_cur_min,      1},
 #line 29 "charmap-kw.gperf"
+      {"escape_char",     tok_escape_char,     1},
+#line 30 "charmap-kw.gperf"
       {"comment_char",    tok_comment_char,    1},
-#line 25 "charmap-kw.gperf"
+#line 26 "charmap-kw.gperf"
       {"code_set_name",   tok_code_set_name,   1},
-#line 40 "charmap-kw.gperf"
+#line 41 "charmap-kw.gperf"
       {"WIDTH_VARIABLE",  tok_width_variable,  0},
-#line 26 "charmap-kw.gperf"
+#line 27 "charmap-kw.gperf"
       {"mb_cur_max",      tok_mb_cur_max,      1},
-#line 35 "charmap-kw.gperf"
+#line 36 "charmap-kw.gperf"
       {"addset",          tok_addset,          1},
-#line 37 "charmap-kw.gperf"
+#line 38 "charmap-kw.gperf"
       {"CHARMAP",         tok_charmap,         0},
-#line 41 "charmap-kw.gperf"
+#line 42 "charmap-kw.gperf"
       {"WIDTH_DEFAULT",   tok_width_default,   0},
       {""},
-#line 33 "charmap-kw.gperf"
+#line 34 "charmap-kw.gperf"
       {"g3esc",           tok_g3esc,           1},
       {""}, {""}, {""}, {""},
-#line 32 "charmap-kw.gperf"
+#line 33 "charmap-kw.gperf"
       {"g2esc",           tok_g2esc,           1},
       {""}, {""}, {""}, {""},
-#line 31 "charmap-kw.gperf"
+#line 32 "charmap-kw.gperf"
       {"g1esc",           tok_g1esc,           1},
       {""}, {""}, {""}, {""},
-#line 30 "charmap-kw.gperf"
+#line 31 "charmap-kw.gperf"
       {"g0esc",           tok_g0esc,           1}
     };
 
diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf
index f0612e4..ee9992d 100644
--- a/locale/programs/locfile-kw.gperf
+++ b/locale/programs/locfile-kw.gperf
@@ -14,8 +14,8 @@
    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.  */
+   along with this program; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <string.h>
 
diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h
index c0f9ce7..f961673 100644
--- a/locale/programs/locfile-kw.h
+++ b/locale/programs/locfile-kw.h
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.2 */
+/* ANSI-C code produced by gperf version 3.0.4 */
 /* Command-line: gperf -acCgopt -k'1,2,5,9,$' -L ANSI-C -N locfile_hash locfile-kw.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -45,8 +45,8 @@
    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.  */
+   along with this program; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <string.h>
 
@@ -127,6 +127,9 @@ hash (register const char *str, register unsigned int len)
 
 #ifdef __GNUC__
 __inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
 #endif
 const struct keyword_t *
 locfile_hash (register const char *str, register unsigned int len)

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=547b5e30dc0828f20351be14d8db160870be72ee

commit 547b5e30dc0828f20351be14d8db160870be72ee
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Fri Mar 9 23:35:39 2012 +0000

    Replace FSF snail mail address with URL in Yacc input.

diff --git a/ChangeLog b/ChangeLog
index 35b5fa3..8ce6438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	[BZ #13673]
+	* intl/plural.y: Replace FSF snail mail address with URL.
+	* intl/plural.c: Regenerated.
+
 2012-03-09  Richard Henderson  <rth@twiddle.net>
 
 	* include/math_private.h: Remove file.
diff --git a/intl/plural.c b/intl/plural.c
index dc89c34..0d8bf4c 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
 
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2009, 2010, 2011 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
 
    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
@@ -45,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -74,7 +73,7 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 189 of yacc.c  */
+/* Line 268 of yacc.c  */
 #line 1 "plural.y"
 
 /* Expression parsing for plural form selection.
@@ -93,9 +92,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
    declaration at the beginning of the file.  The declaration in bison's
@@ -123,8 +121,8 @@
 #define YYPARSE_PARAM	arg
 
 
-/* Line 189 of yacc.c  */
-#line 128 "plural.c"
+/* Line 268 of yacc.c  */
+#line 126 "plural.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -158,6 +156,13 @@
      NUMBER = 262
    };
 #endif
+/* Tokens.  */
+#define EQUOP2 258
+#define CMPOP2 259
+#define ADDOP2 260
+#define MULOP2 261
+#define NUMBER 262
+
 
 
 
@@ -165,8 +170,8 @@
 typedef union YYSTYPE
 {
 
-/* Line 214 of yacc.c  */
-#line 50 "plural.y"
+/* Line 293 of yacc.c  */
+#line 49 "plural.y"
 
   unsigned long int num;
   enum operator op;
@@ -174,8 +179,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 214 of yacc.c  */
-#line 179 "plural.c"
+/* Line 293 of yacc.c  */
+#line 184 "plural.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -185,8 +190,8 @@ typedef union YYSTYPE
 
 /* Copy the second part of user declarations.  */
 
-/* Line 264 of yacc.c  */
-#line 56 "plural.y"
+/* Line 343 of yacc.c  */
+#line 55 "plural.y"
 
 /* Prototypes for local functions.  */
 static struct expression *new_exp PARAMS ((int nargs, enum operator op,
@@ -286,8 +291,8 @@ new_exp_3 (op, bexp, tbranch, fbranch)
 
 
 
-/* Line 264 of yacc.c  */
-#line 291 "plural.c"
+/* Line 343 of yacc.c  */
+#line 296 "plural.c"
 
 #ifdef short
 # undef short
@@ -390,11 +395,11 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -417,24 +422,24 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -463,23 +468,7 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -499,6 +488,26 @@ union yyalloc
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  9
 /* YYLAST -- Last index in YYTABLE.  */
@@ -574,8 +583,8 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,   175,   175,   183,   187,   191,   195,   199,   203,   207,
-     211,   215,   219,   224
+       0,   174,   174,   182,   186,   190,   194,   198,   202,   206,
+     210,   214,   218,   223
 };
 #endif
 
@@ -614,8 +623,8 @@ static const yytype_uint8 yyr2[] =
        2,     1,     1,     3
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
@@ -648,8 +657,7 @@ static const yytype_int8 yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
@@ -661,6 +669,12 @@ static const yytype_uint8 yytable[] =
       16,    13,    14,    15,    16
 };
 
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-10))
+
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
+
 static const yytype_int8 yycheck[] =
 {
        1,    10,    11,     4,    13,    14,     8,     9,     0,    10,
@@ -713,7 +727,6 @@ do								\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
@@ -755,19 +768,10 @@ while (YYID (0))
 #endif
 
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
+/* This macro is provided for backward compatibility. */
 
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 #endif
 
 
@@ -959,7 +963,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
 
 #if YYERROR_VERBOSE
 
@@ -1062,115 +1065,142 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  YYSIZE_T yysize1;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+                if (! (yysize <= yysize1
+                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  return 2;
+                yysize = yysize1;
+              }
+        }
+    }
 
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
+  yysize1 = yysize + yystrlen (yyformat);
+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    return 2;
+  yysize = yysize1;
 
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1203,6 +1233,7 @@ yydestruct (yymsg, yytype, yyvaluep)
     }
 }
 
+
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@@ -1219,12 +1250,9 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
-
-
-
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1411,7 +1439,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1442,8 +1470,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1496,123 +1524,134 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-	case 2:
+        case 2:
 
-/* Line 1464 of yacc.c  */
-#line 176 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 175 "plural.y"
     {
 	    if ((yyvsp[(1) - (1)].exp) == NULL)
 	      YYABORT;
 	    ((struct parse_args *) arg)->res = (yyvsp[(1) - (1)].exp);
-	  ;}
+	  }
     break;
 
   case 3:
 
-/* Line 1464 of yacc.c  */
-#line 184 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 183 "plural.y"
     {
 	    (yyval.exp) = new_exp_3 (qmop, (yyvsp[(1) - (5)].exp), (yyvsp[(3) - (5)].exp), (yyvsp[(5) - (5)].exp));
-	  ;}
+	  }
     break;
 
   case 4:
 
-/* Line 1464 of yacc.c  */
-#line 188 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 187 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 (lor, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-	  ;}
+	  }
     break;
 
   case 5:
 
-/* Line 1464 of yacc.c  */
-#line 192 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 191 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 (land, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-	  ;}
+	  }
     break;
 
   case 6:
 
-/* Line 1464 of yacc.c  */
-#line 196 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 195 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-	  ;}
+	  }
     break;
 
   case 7:
 
-/* Line 1464 of yacc.c  */
-#line 200 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 199 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-	  ;}
+	  }
     break;
 
   case 8:
 
-/* Line 1464 of yacc.c  */
-#line 204 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 203 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-	  ;}
+	  }
     break;
 
   case 9:
 
-/* Line 1464 of yacc.c  */
-#line 208 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 207 "plural.y"
     {
 	    (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-	  ;}
+	  }
     break;
 
   case 10:
 
-/* Line 1464 of yacc.c  */
-#line 212 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 211 "plural.y"
     {
 	    (yyval.exp) = new_exp_1 (lnot, (yyvsp[(2) - (2)].exp));
-	  ;}
+	  }
     break;
 
   case 11:
 
-/* Line 1464 of yacc.c  */
-#line 216 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 215 "plural.y"
     {
 	    (yyval.exp) = new_exp_0 (var);
-	  ;}
+	  }
     break;
 
   case 12:
 
-/* Line 1464 of yacc.c  */
-#line 220 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 219 "plural.y"
     {
 	    if (((yyval.exp) = new_exp_0 (num)) != NULL)
 	      (yyval.exp)->val.num = (yyvsp[(1) - (1)].num);
-	  ;}
+	  }
     break;
 
   case 13:
 
-/* Line 1464 of yacc.c  */
-#line 225 "plural.y"
+/* Line 1806 of yacc.c  */
+#line 224 "plural.y"
     {
 	    (yyval.exp) = (yyvsp[(2) - (3)].exp);
-	  ;}
+	  }
     break;
 
 
 
-/* Line 1464 of yacc.c  */
-#line 1614 "plural.c"
+/* Line 1806 of yacc.c  */
+#line 1642 "plural.c"
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -1640,6 +1679,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -1647,37 +1690,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -1736,7 +1778,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -1795,8 +1837,13 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -1821,8 +1868,8 @@ yyreturn:
 
 
 
-/* Line 1684 of yacc.c  */
-#line 230 "plural.y"
+/* Line 2067 of yacc.c  */
+#line 229 "plural.y"
 
 
 void
diff --git a/intl/plural.y b/intl/plural.y
index a1ffb9e..2df3604 100644
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -15,9 +15,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
    declaration at the beginning of the file.  The declaration in bison's

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                         |   26 ++
 NEWS                              |    4 +-
 intl/plural.c                     |  539 ++++++++++++++++++++-----------------
 intl/plural.y                     |    5 +-
 locale/programs/charmap-kw.gperf  |    4 +-
 locale/programs/charmap-kw.h      |   45 ++--
 locale/programs/locfile-kw.gperf  |    4 +-
 locale/programs/locfile-kw.h      |    9 +-
 localedata/ChangeLog              |    5 +
 localedata/locales/br_FR@euro     |    2 +-
 localedata/locales/ca_ES@euro     |    2 +-
 localedata/locales/cs_CZ          |    2 +-
 localedata/locales/de_BE@euro     |    2 +-
 localedata/locales/de_DE          |    2 +-
 localedata/locales/de_DE@euro     |    2 +-
 localedata/locales/de_LU@euro     |    2 +-
 localedata/locales/el_GR@euro     |    2 +-
 localedata/locales/en_AG          |    2 +-
 localedata/locales/en_IE@euro     |    2 +-
 localedata/locales/en_US          |    2 +-
 localedata/locales/es_CR          |    2 +-
 localedata/locales/es_ES@euro     |    2 +-
 localedata/locales/es_NI          |    2 +-
 localedata/locales/es_PR          |    2 +-
 localedata/locales/eu_ES@euro     |    2 +-
 localedata/locales/fi_FI@euro     |    2 +-
 localedata/locales/fr_BE@euro     |    2 +-
 localedata/locales/fr_FR@euro     |    2 +-
 localedata/locales/fr_LU@euro     |    2 +-
 localedata/locales/fy_NL          |    2 +-
 localedata/locales/ga_IE@euro     |    2 +-
 localedata/locales/gl_ES@euro     |    2 +-
 localedata/locales/it_IT@euro     |    2 +-
 localedata/locales/nl_AW          |    2 +-
 localedata/locales/nl_BE@euro     |    2 +-
 localedata/locales/nl_NL@euro     |    2 +-
 localedata/locales/pt_PT@euro     |    2 +-
 localedata/locales/sv_FI@euro     |    2 +-
 localedata/locales/tr_CY          |    2 +-
 localedata/locales/wa_BE@euro     |    2 +-
 nptl/ChangeLog                    |    5 +
 nptl/pt-crti.S                    |    5 +-
 posix/bug-regex33.c               |    5 +-
 stdio-common/bug-vfprintf-nargs.c |    5 +-
 sysdeps/i386/crti.S               |    5 +-
 sysdeps/i386/crtn.S               |    5 +-
 sysdeps/powerpc/powerpc32/crti.S  |    5 +-
 sysdeps/powerpc/powerpc32/crtn.S  |    5 +-
 sysdeps/powerpc/powerpc64/crti.S  |    5 +-
 sysdeps/powerpc/powerpc64/crtn.S  |    5 +-
 sysdeps/sh/crti.S                 |    5 +-
 sysdeps/sh/crtn.S                 |    5 +-
 sysdeps/x86_64/fpu/e_expf.S       |    5 +-
 53 files changed, 422 insertions(+), 346 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]