diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-29 21:10:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-30 00:13:15 -0800 |
| commit | f3155e8a271f39009ff12a0974de309ffa73af3d (patch) | |
| tree | 996d3b5a5892f47355d628321cf1c399e0b2f082 /lib/regcomp.c | |
| parent | d0fec054e005ffce335a25b95a6f863ce27624f2 (diff) | |
| download | gnulib-f3155e8a271f39009ff12a0974de309ffa73af3d.tar.gz | |
regex: merge glibc changes
Also, copy the license wording from glibc. This simplifies
merging changes. gnulib-tool will change the wording to GPL as
appropriate, when importing it to other packages. The only
glibc change made since the last merge, which needs merging, is:
2012-05-24 Andreas Schwab <schwab@linux-m68k.org>
* lib/regex_internal.h (gettext): Remove use of INTUSE.
Diffstat (limited to 'lib/regcomp.c')
| -rw-r--r-- | lib/regcomp.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/regcomp.c b/lib/regcomp.c index 6d5525a6f0..3e2165b2a9 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -3,18 +3,19 @@ This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. - 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 GNU C Library is free software; you can redistribute it and/or + 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. - This program is distributed in the hope that it will be useful, + 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 General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, see <http://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, size_t length, reg_syntax_t syntax); |