X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fchown.c;h=b7786f62057b7b694df08977c485f62462aac352;hb=20229ba96d971f97ff03ab74eeb4e7de1acccf98;hp=2a7bba1a6c09e1bfc4b21c4355a1e87960d62f7a;hpb=14bf04a59fbfa9ae7a9b55f7885ed96a5f0341ac;p=gnulib.git

diff --git a/lib/chown.c b/lib/chown.c
index 2a7bba1a6..b7786f620 100644
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -1,6 +1,7 @@
 /* provide consistent interface to chown for systems that don't interpret
    an ID of -1 as meaning `don't change the corresponding ID'.
-   Copyright (C) 1997, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 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
@@ -18,23 +19,24 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
-/* Disable the definition of chown to rpl_chown (from config.h) in this
-   file.  Otherwise, we'd get conflicting prototypes for rpl_chown on
-   most systems.  */
-#undef chown
+/* Specification.  */
+#include <unistd.h>
 
 #include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
-#include "stat-macros.h"
+/* Below we refer to the system's chown().  */
+#undef chown
+
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
 
 /* Provide a more-closely POSIX-conforming version of chown on
    systems with one or both of the following problems: