X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcloexec.c;h=ff8105ba024bd8f04a88ece81dd2cca3b6f8d95b;hb=deb58d481fc8dc345e463002c7087a08a4f1d5f0;hp=79d4ed0b8d29a0e03bcba408cf45f26b39e94b36;hpb=d1eb42bdbbaf00d38b2a479e9aa40207b79bd090;p=gnulib.git

diff --git a/lib/cloexec.c b/lib/cloexec.c
index 79d4ed0b8..ff8105ba0 100644
--- a/lib/cloexec.c
+++ b/lib/cloexec.c
@@ -1,10 +1,11 @@
 /* closexec.c - set or clear the close-on-exec descriptor flag
-   Copyright (C) 1991, 2004 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1991, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,21 +13,15 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    The code is taken from glibc/manual/llio.texi  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "cloexec.h"
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
+#include <unistd.h>
 #include <fcntl.h>
 
 #ifndef FD_CLOEXEC