Re: config.h inclusion leftovers

[Jim Meyering]

Ralf Wildenhues <address@hidden> wrote:
> The following patch changes the last files over to the agreed-to style
> for inclusion of `config.h'.
>
>       * lib/mkdtemp.c, lib/setenv.c, lib/unsetenv.c: Normalize
>       inclusion of `config.h'.

Applied.
Hmm.  Just noticed that those files are normally mirrored from
gettext (see gnulib/config/srclist.txt).

Bruno, would you accept Ralf's patch so we don't have to
decouple those files?
I noticed some more small differences, when comparing to
coreutils copies. We include <unistd.h> unconditionally
everywhere else.  Why not do so here, too?

        * mkdtemp.c, setenv.c, unsetenv.c: Include <unistd.h> unconditionally.

How about this additional patch?

Index: setenv.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/setenv.c,v
retrieving revision 1.14
diff -u -p -r1.14 setenv.c
--- setenv.c    24 Feb 2006 10:09:59 -0000      1.14
+++ setenv.c    24 Feb 2006 10:12:13 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003,2005 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
@@ -27,9 +27,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#if _LIBC || HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if !_LIBC
 # include "allocsa.h"
Index: unsetenv.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/unsetenv.c,v
retrieving revision 1.6
diff -u -p -r1.6 unsetenv.c
--- unsetenv.c  24 Feb 2006 10:09:59 -0000      1.6
+++ unsetenv.c  24 Feb 2006 10:12:13 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2002,2005 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 @@ extern int errno;
 
 #include <stdlib.h>
 #include <string.h>
-#if _LIBC || HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if !_LIBC
 # define __environ     environ