diff options
| author | Jim Meyering <jim@meyering.net> | 2002-11-28 09:19:26 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2002-11-28 09:19:26 +0000 |
| commit | 8f5674daf918708eafe7297ff164deba6a43930b (patch) | |
| tree | 21cf6cee4c7fa39b1c61a10c83f4b486914fe416 /lib | |
| parent | bb07ab9b5cb105c2032c7f1b92bd740b2d2a4510 (diff) | |
| download | coreutils-8f5674daf918708eafe7297ff164deba6a43930b.tar.xz | |
Merge some more, in preparation for merge back into libc.
(_): Define only if not already defined.
Move definition to follow all #include directives.
Include unlocked-io.h only if !_LIBC.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/error.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/error.c b/lib/error.c index 3161538e1..6af7cb83a 100644 --- a/lib/error.c +++ b/lib/error.c @@ -31,7 +31,6 @@ #else # include "gettext.h" #endif -#define _(msgid) gettext (msgid) #ifdef _LIBC # include <wchar.h> @@ -59,7 +58,14 @@ void exit (); #endif #include "error.h" -#include "unlocked-io.h" + +#if !_LIBC +# include "unlocked-io.h" +#endif + +#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 |