diff options
| author | Jim Meyering <jim@meyering.net> | 2002-12-01 10:56:47 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2002-12-01 10:56:47 +0000 |
| commit | 7730fc35b7e28c48f7ece18a78b6e91c2274ebef (patch) | |
| tree | 9452eb8548cf735cfe161b26b53e6d07e5e1ec4d /lib/getopt.c | |
| parent | 61bbb627cc19fffe46499330ca0f5ab0ec717531 (diff) | |
| download | coreutils-7730fc35b7e28c48f7ece18a78b6e91c2274ebef.tar.xz | |
Update from gnulib (trivial changes).
Diffstat (limited to 'lib/getopt.c')
| -rw-r--r-- | lib/getopt.c | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/lib/getopt.c b/lib/getopt.c index 289d137e2..3e7928a83 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -6,20 +6,19 @@ 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. */ /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. Ditto for AIX 3.2 and <stdlib.h>. */ @@ -76,19 +75,16 @@ # endif #endif -#ifndef _ +#ifdef _LIBC +# include <libintl.h> +#else /* This is for other GNU distributions with internationalized messages. */ -# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC -# include <libintl.h> -# ifndef _ -# define _(msgid) gettext (msgid) -# endif -# else -# define _(msgid) (msgid) -# endif -# if defined _LIBC && defined USE_IN_LIBIO -# include <wchar.h> -# endif +# include "gettext.h" +#endif +#define _(msgid) gettext (msgid) + +#if defined _LIBC && defined USE_IN_LIBIO +# include <wchar.h> #endif #ifndef attribute_hidden |