X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsavedir.c;h=f72086659802e02cb6ad2d3e4ee4e646278dc362;hb=0bb0c42bbc23b604ec21f3f9e30363eb17fdc484;hp=76634eef4e62d203b25e329ecf922d7b9d3e850b;hpb=53862d8f1a0ef57d53ed1fc3035cde8a6e56bca2;p=gnulib.git

diff --git a/lib/savedir.c b/lib/savedir.c
index 76634eef4..f72086659 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -1,5 +1,5 @@
 /* savedir.c -- save the list of files in a directory in a string
-   Copyright (C) 1990, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998 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
@@ -17,13 +17,13 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include <sys/types.h>
 
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
@@ -62,7 +62,9 @@ char *realloc ();
 # define NULL 0
 #endif
 
+#ifndef stpcpy
 char *stpcpy ();
+#endif
 
 #include "savedir.h"
 
@@ -74,9 +76,7 @@ char *stpcpy ();
    Return NULL if DIR cannot be opened or if out of memory. */
 
 char *
-savedir (dir, name_size)
-     const char *dir;
-     unsigned int name_size;
+savedir (const char *dir, unsigned int name_size)
 {
   DIR *dirp;
   struct dirent *dp;