X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fchown.c;h=452fdfcac6ef41b488fc25ce25745bb9ebf5d653;hb=691c858a4e2c7d47e41ca3b5c4ac4aab77b8f472;hp=1d3346d364a3f8d69670e1d96c768dc844d8b04b;hpb=1ab0c59c605bdf2cb75edf743f78e5317796b355;p=gnulib.git

diff --git a/lib/chown.c b/lib/chown.c
index 1d3346d36..452fdfcac 100644
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -19,18 +19,22 @@
 /* written by Jim Meyering */
 
 #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
+
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
+#include <sys/stat.h>
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
 /* FIXME: describe.  */
 
 int
-chown (file, gid, uid)
-     const char *file;
-     gid_t git;
-     uid_t uit;
+rpl_chown (const char *file, uid_t uid, gid_t gid)
 {
   if (gid == (gid_t) -1 || uid == (uid_t) -1)
     {
@@ -47,7 +51,5 @@ chown (file, gid, uid)
 	uid = file_stats.st_uid;
     }
 
-#undef chown
-
-  return chown (file, gid, uid);
+  return chown (file, uid, gid);
 }