(CLOSEDIR): Remove. All uses changed to closedir.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 4cf0a6dc076d27b53e2f75bd197d497db225c929..6b50d62f3b1dc30ebc1bb60c2a6e5836e0c3a039 100644 (file)
--- 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 b08f32b7916de07b3891e16d5fbedf0fc85c0a29..d5ced6cd3d9efa6cc7d43f0eb27de08606968b08 100644 (file)
--- 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)
     {