X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ferror.c;h=db97393d0504db5462ccfb8cd8c76cfd941609d6;hb=579b8ed5d608f9746b42e48bfc954823d27af8f6;hp=9c0700c2e38cbe59ca23c1d98bb9da6bcd47796e;hpb=e5bf94ff351ef97da921c0c47b6a5ff9a405821d;p=gnulib.git

diff --git a/lib/error.c b/lib/error.c
index 9c0700c2e..db97393d0 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -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
@@ -54,10 +59,7 @@ void exit ();
 #endif
 
 #include "error.h"
-
-#ifndef _
-# define _(String) String
-#endif
+#include "unlocked-io.h"
 
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this