merge with 1.12

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/makepath.c b/lib/makepath.c
index 9066874cd..b59211672 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -99,6 +99,16 @@ void error ();
    Return 0 if ARGPATH exists as a directory with the proper
    ownership and permissions when done, otherwise 1.  */
 
+#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+int
+make_path (const char *argpath,
+	   int mode,
+	   int parent_mode,
+	   uid_t owner,
+	   gid_t group,
+	   int preserve_existing,
+	   const char *verbose_fmt_string)
+#else
 int
 make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
 	   verbose_fmt_string)
@@ -109,6 +119,7 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing,
      gid_t group;
      int preserve_existing;
      const char *verbose_fmt_string;
+#endif
 {
   char *dirpath;		/* A copy we can scribble NULs on.  */
   struct stat stats;