diff options
author | Andreas Jaeger <aj@suse.de> | 2001-07-06 05:37:16 +0000 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2001-07-06 05:37:16 +0000 |
commit | a1b36134f6634375dc87abea1b7c00e241797bea (patch) | |
tree | 6ef8c5025734c1128bbaf88794072266d09b2e3e /locale/programs | |
parent | 41bdb6e20c5d2df34a740cbd70e11c05025dfd12 (diff) | |
download | glibc-a1b36134f6634375dc87abea1b7c00e241797bea.tar.gz glibc-a1b36134f6634375dc87abea1b7c00e241797bea.tar.xz glibc-a1b36134f6634375dc87abea1b7c00e241797bea.zip |
* COPYING: Fix Y2k bug in sample copyright notices.
* manual/lesser.texi: Renamed from manual/lgpl.texinfo, as fsf.org uses the name "lesser.texi". * manual/Makefile (texis): Follow rename.
Diffstat (limited to 'locale/programs')
-rw-r--r-- | locale/programs/charmap-kw.h | 26 | ||||
-rw-r--r-- | locale/programs/locfile-kw.h | 26 |
2 files changed, 30 insertions, 22 deletions
diff --git a/locale/programs/charmap-kw.h b/locale/programs/charmap-kw.h index 4b402165ef..089f45d7d8 100644 --- a/locale/programs/charmap-kw.h +++ b/locale/programs/charmap-kw.h @@ -1,23 +1,23 @@ -/* ANSI-C code produced by gperf version 2.7.1 (19981006 egcs) */ -/* Command-line: gperf -acCgopt -k1,2,5,9,$ -L ANSI-C -N charmap_hash programs/charmap-kw.gperf */ +/* ANSI-C code produced by gperf version 2.7.2 */ +/* Command-line: gperf -acCgopt -k'1,2,5,9,$' -L ANSI-C -N charmap_hash programs/charmap-kw.gperf */ /* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.org>. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. The GNU C Library 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 - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + 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. */ #include <string.h> @@ -33,6 +33,10 @@ struct keyword_t ; #ifdef __GNUC__ __inline +#else +#ifdef __cplusplus +inline +#endif #endif static unsigned int hash (register const char *str, register unsigned int len) @@ -131,7 +135,7 @@ charmap_hash (register const char *str, register unsigned int len) { register const char *s = wordlist[key].name; - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0') return &wordlist[key]; } } diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h index f456920603..da4a63e033 100644 --- a/locale/programs/locfile-kw.h +++ b/locale/programs/locfile-kw.h @@ -1,23 +1,23 @@ -/* ANSI-C code produced by gperf version 2.7 */ -/* Command-line: gperf -acCgopt -k1,2,5,9,$ -L ANSI-C -N locfile_hash programs/locfile-kw.gperf */ +/* ANSI-C code produced by gperf version 2.7.2 */ +/* Command-line: gperf -acCgopt -k'1,2,5,9,$' -L ANSI-C -N locfile_hash programs/locfile-kw.gperf */ /* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. The GNU C Library 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 - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + 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. */ #include <string.h> @@ -33,6 +33,10 @@ struct keyword_t ; #ifdef __GNUC__ __inline +#else +#ifdef __cplusplus +inline +#endif #endif static unsigned int hash (register const char *str, register unsigned int len) @@ -416,7 +420,7 @@ locfile_hash (register const char *str, register unsigned int len) { register const char *s = wordlist[key].name; - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0') return &wordlist[key]; } } |