X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdup2.c;h=09990823be4122fe4c42409e8fa670817ec59a6b;hb=952be23bc009785c91c76e8dbb29c73001e3267a;hp=730434f25953756eaa6dbeaf749db29d6cc7b724;hpb=d349992d82f97d614404565ff66e3f8a47b4a568;p=gnulib.git

diff --git a/lib/dup2.c b/lib/dup2.c
index 730434f25..09990823b 100644
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -1,10 +1,11 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1999, 2004, 2005, 2006, 2007 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,27 +13,17 @@
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* written by Paul Eggert */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
+#include <config.h>
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+/* Specification.  */
+#include <unistd.h>
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <errno.h>
+#include <fcntl.h>
 
 #ifndef F_DUPFD
 static int