From caf80066789b1abb3014ae2b916f277122b64451 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 29 Jul 2006 14:38:53 +0000 Subject: [PATCH] setenv.c comes from gettext / libiconv again. --- config/ChangeLog | 4 ++++ config/srclist.txt | 6 +----- lib/ChangeLog | 4 ++++ lib/setenv.c | 4 +++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 706748e2f..1bef73f76 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2006-07-29 Bruno Haible + + * srclist.txt (*setenv.[ch]): Remove rules. + 2006-07-22 Bruno Haible * srclist.txt: Resync printf-args.c, vasnprintf.c, localcharset.c, diff --git a/config/srclist.txt b/config/srclist.txt index 97b004722..850814669 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.130 2006-07-22 17:03:06 haible Exp $ +# $Id: srclist.txt,v 1.131 2006-07-29 14:38:53 haible Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -284,10 +284,6 @@ $LIBCSRC/time/mktime.c lib gpl #$LIBCSRC/sysdeps/unix/sysv/gethostname.c lib gpl #$LIBCSRC/sysdeps/unix/utime.c lib gpl -$COREUTILS/lib/setenv.c lib gpl -$COREUTILS/lib/setenv.h lib gpl -$COREUTILS/lib/unsetenv.c lib gpl - $LIBTOOL/libltdl/argz.c lib gpl $LIBTOOL/libltdl/argz_.h lib gpl $LIBTOOL/libltdl/m4/argz.m4 m4 diff --git a/lib/ChangeLog b/lib/ChangeLog index a7dc9e839..091ee115f 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-07-29 Bruno Haible + + * setenv.c: Undo unintended modification done on 2006-02-27. + 2006-07-28 Eric Blake * regex_internal.h (struct re_dfa_t) [!_LIBC]: Avoid invalid C89 diff --git a/lib/setenv.c b/lib/setenv.c index c607125a5..335d1d2f9 100644 --- a/lib/setenv.c +++ b/lib/setenv.c @@ -27,7 +27,9 @@ #include #include -#include +#if _LIBC || HAVE_UNISTD_H +# include +#endif #if !_LIBC # include "allocsa.h" -- 2.11.0