setenv.c comes from gettext / libiconv again.

diff --git a/config/ChangeLog b/config/ChangeLog
index 706748e..1bef73f 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-29  Bruno Haible  <bruno@clisp.org>
+
+       * srclist.txt (*setenv.[ch]): Remove rules.
+
 2006-07-22  Bruno Haible  <bruno@clisp.org>
 
        * srclist.txt: Resync printf-args.c, vasnprintf.c, localcharset.c,

diff --git a/config/srclist.txt b/config/srclist.txt
index 97b0047..8508146 100644 (file)
--- 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 a7dc9e8..091ee11 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-29  Bruno Haible  <bruno@clisp.org>
+
+       * setenv.c: Undo unintended modification done on 2006-02-27.
+
 2006-07-28  Eric Blake  <ebb9@byu.net>
 
        * regex_internal.h (struct re_dfa_t) [!_LIBC]: Avoid invalid C89

diff --git a/lib/setenv.c b/lib/setenv.c
index c607125..335d1d2 100644 (file)
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -27,7 +27,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#if _LIBC || HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #if !_LIBC
 # include "allocsa.h"