diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-06-28 22:25:49 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-06-28 22:25:49 +0000 |
| commit | 44d63b02db450f7d9cdd97622399005ee321e404 (patch) | |
| tree | a95ebfedd381d40b4d8360aca8cca7eed3c2ff9b | |
| parent | b0df6af4ba3f1b975ae8a39c959862f9f4c37820 (diff) | |
| download | gnulib-44d63b02db450f7d9cdd97622399005ee321e404.tar.gz | |
* lib/savedir.c (CLOSEDIR): Remove. All uses changed to closedir.
* m4/savedir.m4: Remove AC_FUNC_CLOSEDIR_VOID requirement.
| -rw-r--r-- | lib/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/savedir.c | 11 | ||||
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/savedir.m4 | 5 |
4 files changed, 12 insertions, 13 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 27eddb8b26..b5e13f8fc7 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-05-12 Bruno Haible <bruno@clisp.org> * mkdtemp.c [MINGW]: Include <io.h>. diff --git a/lib/savedir.c b/lib/savedir.c index b08f32b791..d5ced6cd3d 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) { diff --git a/m4/ChangeLog b/m4/ChangeLog index 35e01a4d31..bde4a9949c 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,4 +1,6 @@ -2006-06-28 Derek Price <derek@ximbiot.com> +2006-06-28 Derek R. Price <derek@ximbiot.com> + + * savedir.m4: Remove AC_FUNC_CLOSEDIR_VOID requirement. * fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Don't require AC_C_CONST, since it's obsolete. diff --git a/m4/savedir.m4 b/m4/savedir.m4 index 8305816aca..0c0ee09281 100644 --- a/m4/savedir.m4 +++ b/m4/savedir.m4 @@ -1,5 +1,5 @@ -# savedir.m4 serial 4 -dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# savedir.m4 serial 5 +dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,5 +11,4 @@ AC_DEFUN([gl_SAVEDIR], dnl Prerequisites of lib/savedir.c. AC_REQUIRE([AC_HEADER_DIRENT]) - AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID]) ]) |