X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ferror.c;h=6b3662d61d74ac843bbdd9fb3656269187a77061;hb=f53990f35803666791f4163e0f9d206bd8c4690e;hp=94e32fd82294069edbaba4a70b623f6d19fb7e31;hpb=917752adb19961999cd68c6c961efffe33c85141;p=gnulib.git

diff --git a/lib/error.c b/lib/error.c
index 94e32fd82..6b3662d61 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -29,9 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef _LIBC
-# include <libintl.h>
-#else
+#if !_LIBC && ENABLE_NLS
 # include "gettext.h"
 #endif
 
@@ -40,7 +38,7 @@
 # define mbsrtowcs __mbsrtowcs
 #endif
 
-#ifdef USE_UNLOCKED_IO
+#if USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #endif