summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ChangeLog5
-rw-r--r--lib/savedir.c11
2 files changed, 7 insertions, 9 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 4cf0a6dc0..6b50d62f3 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-28 Derek R. Price <derek@ximbiot.com>
+
+ * savedir.c (CLOSEDIR): Remove. All uses changed to closedir.
+ Autoconf 2.60 says this stuff was obsolete.
+
2006-06-20 Paul Eggert <eggert@cs.ucla.edu>
* openat.c (openat): Use ?:, not if, to work around GCC bug 4210
diff --git a/lib/savedir.c b/lib/savedir.c
index b08f32b79..d5ced6cd3 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -1,6 +1,6 @@
/* savedir.c -- save the list of files in a directory in a string
- Copyright 1990, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free
+ Copyright 1990, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 Free
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@ -44,13 +44,6 @@
# endif
#endif
-#ifdef CLOSEDIR_VOID
-/* Fake a return value. */
-# define CLOSEDIR(d) (closedir (d), 0)
-#else
-# define CLOSEDIR(d) closedir (d)
-#endif
-
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@ -117,7 +110,7 @@ savedirstream (DIR *dirp)
}
name_space[used] = '\0';
save_errno = errno;
- if (CLOSEDIR (dirp) != 0)
+ if (closedir (dirp) != 0)
save_errno = errno;
if (save_errno != 0)
{