diff options
| author | Jim Meyering <jim@meyering.net> | 2003-08-07 09:09:00 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-08-07 09:09:00 +0000 |
| commit | 3b3e8d0f25a3c3e4f402557630cc8c86a2fd60fa (patch) | |
| tree | 0125a4f7ef5ec18a71dc9e4dff73b88e55087a49 /lib/regex.c | |
| parent | 33faa30817babfcfd005fb41575bce8300ed399f (diff) | |
| download | coreutils-3b3e8d0f25a3c3e4f402557630cc8c86a2fd60fa.tar.xz | |
Sync with gnulib.
Diffstat (limited to 'lib/regex.c')
| -rw-r--r-- | lib/regex.c | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/lib/regex.c b/lib/regex.c index 7d7a9793e..4908bd925 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -2,23 +2,22 @@ version 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the internationalization features.) - Copyright (C) 1993-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2000-2002 Free Software Foundation, Inc. This file is part of the GNU C Library. - 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 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 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 - Lesser General Public License for more details. + 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 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. */ + 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. */ /* AIX requires this to be the first thing in the file. */ #if defined _AIX && !defined REGEX_MALLOC @@ -95,21 +94,15 @@ # include <locale/coll-lookup.h> # endif -/* This is for other GNU distributions with internationalized messages. */ -# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC +# ifdef _LIBC # include <libintl.h> -# ifdef _LIBC -# undef gettext -# define gettext(msgid) __dcgettext ("libc", msgid, LC_MESSAGES) -# endif +# undef gettext +# define gettext(msgid) __dcgettext ("libc", msgid, LC_MESSAGES) + /* This define is so xgettext can find the internationalizable strings. */ +# define gettext_noop(msgid) msgid # else -# define gettext(msgid) (msgid) -# endif - -# ifndef gettext_noop -/* This define is so xgettext can find the internationalizable - strings. */ -# define gettext_noop(String) String +/* This is for other GNU distributions with internationalized messages. */ +# include "gettext.h" # endif /* Support for bounded pointers. */ |