X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Funlinkdir.c;h=12e669e752bfd7c0da80cace0d4a5bac7a2d4543;hb=cb9819cbb9261bd50c3466cf0a4cd873f0d7ebd7;hp=b12d2a4925daf9b08c7e299a9ddbbeba75091069;hpb=0a335d096a69ab6b41b879cc15c720e37991a93a;p=gnulib.git

diff --git a/lib/unlinkdir.c b/lib/unlinkdir.c
index b12d2a492..12e669e75 100644
--- a/lib/unlinkdir.c
+++ b/lib/unlinkdir.c
@@ -1,11 +1,11 @@
 /* unlinkdir.c - determine (and maybe change) whether we can unlink directories
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
@@ -13,8 +13,7 @@
    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 St, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert and Jim Meyering.  */
 
@@ -25,9 +24,7 @@
 #if HAVE_PRIV_H
 # include <priv.h>
 #endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if ! UNLINK_CANNOT_UNLINK_DIR