X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Futime.c;h=9ddb8b86f83bd7b9e03b9bf59416c9a6a016e8bf;hb=fa3486514bd8f15f8eb4c49821d0356b52e5a335;hp=906cec8d7900f77186961e9e2f19836400f71210;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/utime.c b/lib/utime.c
index 906cec8d7..9ddb8b86f 100644
--- a/lib/utime.c
+++ b/lib/utime.c
@@ -1,8 +1,9 @@
-/* Copyright (C) 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001, 2002, 2003, 2004, 2006 Free Software
+   Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
+   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
+   Free Software Foundation; either version 3 of the License, or any
    later version.
 
    This program is distributed in the hope that it will be useful,
@@ -11,14 +12,11 @@
    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/>.  */
 
 /* derived from a function in touch.c */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef utime
 
 #include <sys/types.h>
@@ -48,6 +46,11 @@ struct utimbuf
 };
 #endif
 
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
+
 /* Emulate utime (file, NULL) for systems (like 4.3BSD) that do not
    interpret it to set the access and modification times of FILE to
    the current time.  Return 0 if successful, -1 if not. */