Re: obsolete autoconf macros: CL_CLOSEDIR

[Bruno H. <br...@cl...>]

CL_CLOSEDIR can at least be simplified. I think it's probable that the
mentioned Cygwin bug is not relevant nowadays any more, but I'm not sure.

2008-05-31  Bruno Haible  <br...@cl...>

	* m4/closedir.m4 (CL_CLOSEDIR): Remove check for the prototype.
	Don't define RETCLOSEDIRTYPE any more.

diff -c -3 -r1.141 configure.in
*** src/configure.in	31 May 2008 12:28:56 -0000	1.141
--- src/configure.in	31 May 2008 12:39:04 -0000
***************
*** 128,134 ****
  AC_HEADER_TIME
  CL_STAT        dnl DEFS HAVE_LSTAT etc
  CL_ELOOP       dnl DEFS ELOOP_VALUE
! CL_CLOSEDIR    dnl DEFS RETCLOSEDIRTYPE, VOID_CLOSEDIR
  CL_IOCTL dnl DEFS HAVE_IOCTL, IOCTL_REQUEST_T, IOCTL_ARGUMENT_T, IOCTL_DOTS HAVE_FIONREAD, NEED_SYS_FILIO_H, NEED_SYS_IOCTL_H, HAVE_RELIABLE_FIONREAD
  CL_POLL dnl DEFS HAVE_POLL, HAVE_RELIABLE_POLL
  CL_SELECT dnl DEFS HAVE_SELECT, SELECT_WIDTH_T, SELECT_SET_T, SELECT_CONST, HAVE_RELIABLE_SELECT
--- 128,134 ----
  AC_HEADER_TIME
  CL_STAT        dnl DEFS HAVE_LSTAT etc
  CL_ELOOP       dnl DEFS ELOOP_VALUE
! CL_CLOSEDIR    dnl DEFS VOID_CLOSEDIR
  CL_IOCTL dnl DEFS HAVE_IOCTL, IOCTL_REQUEST_T, IOCTL_ARGUMENT_T, IOCTL_DOTS HAVE_FIONREAD, NEED_SYS_FILIO_H, NEED_SYS_IOCTL_H, HAVE_RELIABLE_FIONREAD
  CL_POLL dnl DEFS HAVE_POLL, HAVE_RELIABLE_POLL
  CL_SELECT dnl DEFS HAVE_SELECT, SELECT_WIDTH_T, SELECT_SET_T, SELECT_CONST, HAVE_RELIABLE_SELECT
diff -c -3 -r1.85 unix.d
*** src/unix.d	31 May 2008 12:04:33 -0000	1.85
--- src/unix.d	31 May 2008 12:39:05 -0000
***************
*** 405,411 ****
  
  /* directory search: */
  #include <dirent.h>
! /* declared in one of the above includes: opendir(), readdir(), closedir() */
  #ifdef VOID_CLOSEDIR
    #define CLOSEDIR(dirp)  (closedir(dirp),0)
  #else
--- 405,411 ----
  
  /* directory search: */
  #include <dirent.h>
! /* declared in <dirent.h>: opendir(), readdir(), closedir() */
  #ifdef VOID_CLOSEDIR
    #define CLOSEDIR(dirp)  (closedir(dirp),0)
  #else
diff -c -3 -r1.5 closedir.m4
*** src/m4/closedir.m4	29 May 2008 22:18:46 -0000	1.5
--- src/m4/closedir.m4	31 May 2008 12:39:05 -0000
***************
*** 12,35 ****
  
  AC_DEFUN([CL_CLOSEDIR],
  [AC_BEFORE([$0], [CL_FILECHARSET])dnl
! CL_PROTO([closedir], [
! CL_PROTO_RET([
! #include <stdlib.h>
! #ifdef HAVE_UNISTD_H
! #include <sys/types.h>
! #include <unistd.h>
! #endif
! #include <dirent.h>
! ], [int closedir (DIR* dir);], [int closedir();],
! cl_cv_proto_closedir_ret, int, void)],
! [extern $cl_cv_proto_closedir_ret closedir (DIR*);])
! AC_DEFINE_UNQUOTED(RETCLOSEDIRTYPE,$cl_cv_proto_closedir_ret,[closedir() return type])
! if test $cl_cv_proto_closedir_ret = void; then
!   AC_DEFINE(VOID_CLOSEDIR,,[closedir() return value is void or unusable])
! else
!   # The following test is necessary, because Cygwin32 declares closedir()
!   # as returning int but the return value is unusable.
!   AC_CACHE_CHECK(for usable closedir return value, cl_cv_func_closedir_retval,[
  AC_TRY_RUN([
  #include <stdlib.h>
  #ifdef HAVE_UNISTD_H
--- 12,20 ----
  
  AC_DEFUN([CL_CLOSEDIR],
  [AC_BEFORE([$0], [CL_FILECHARSET])dnl
! # The following test is necessary, because Cygwin32 declares closedir()
! # as returning int but the return value is unusable.
! AC_CACHE_CHECK(for usable closedir return value, cl_cv_func_closedir_retval,[
  AC_TRY_RUN([
  #include <stdlib.h>
  #ifdef HAVE_UNISTD_H
***************
*** 45,49 ****
  case "$cl_cv_func_closedir_retval" in
    *no) AC_DEFINE(VOID_CLOSEDIR,,[closedir() return value is void or unusable]) ;;
  esac
- fi
  ])
--- 30,33 ----