diff options
author | Jim Meyering <jim@meyering.net> | 2002-11-23 15:05:32 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2002-11-23 15:05:32 +0000 |
commit | ebd76c09f40780ff518411302f5ec44131193766 (patch) | |
tree | 97244d990204085ddcee0fdcad976817b3932351 /lib | |
parent | f1b9a8744c2b38a544f1ea3d608d20c9e51b577a (diff) | |
download | coreutils-ebd76c09f40780ff518411302f5ec44131193766.tar.xz |
From gnulib, by Bruno Haible
Include gettext.h instead of <libintl.h>.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/error.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/error.c b/lib/error.c index c02abcee8..dc694c03b 100644 --- a/lib/error.c +++ b/lib/error.c @@ -1,5 +1,5 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Its master source is NOT part of the C library, however. The master source lives in /gd/gnu/lib. @@ -25,9 +25,14 @@ #endif #include <stdio.h> -#if HAVE_LIBINTL_H + +#ifdef _LIBC # include <libintl.h> +#else +# include "gettext.h" #endif +#define _(msgid) gettext (msgid) + #ifdef _LIBC # include <wchar.h> # define mbsrtowcs __mbsrtowcs @@ -56,10 +61,6 @@ void exit (); #include "error.h" #include "unlocked-io.h" -#ifndef _ -# define _(String) String -#endif - /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this function without parameters instead. */ |