diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-01-22 06:25:53 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-01-22 06:25:53 +0000 |
| commit | 15ac53209fcbbb55dfa6acdad49531d4cadcec5e (patch) | |
| tree | d84a74ea31aefc9fbb29f48fce4f2d385f45a1a3 /lib | |
| parent | 9e09c422a240d32bcb82e158e055c8ef326be1db (diff) | |
| download | coreutils-15ac53209fcbbb55dfa6acdad49531d4cadcec5e.tar.xz | |
Sync from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ChangeLog | 7 | ||||
| -rw-r--r-- | lib/error.c | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 5ea47f066..34cb44287 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2005-01-21 Paul Eggert <eggert@cs.ucla.edu> + + Sync from gnulib. + * error.c [!_LIBC && !ENABLE_NLS]: Do not include "gettext.h"; + not needed. This removes a dependency on the gettext module. + [defined _LIBC]: Do not include <libintl.h>; not needed. + 2005-01-20 Paul Eggert <eggert@cs.ucla.edu> * save-cwd.c (save_cwd): Remove code to support the case diff --git a/lib/error.c b/lib/error.c index 9bb3e558c..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 |