From: Jim Meyering <jim@meyering.net>
Date: Thu, 28 Nov 2002 09:19:26 +0000 (+0000)
Subject: Merge some more, in preparation for merge back into libc.
X-Git-Tag: v4.5.4~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f5674daf918708eafe7297ff164deba6a43930b;p=thirdparty%2Fcoreutils.git

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.
---

diff --git a/lib/error.c b/lib/error.c
index 3161538e1f..6af7cb83ac 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