From 0330a4d918dcbf6edb1ce46956a20bde9a2444f9 Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Wed, 8 Feb 2017 20:36:35 +0100 Subject: [PATCH] Remove `AC_HEADER_DIRENT` from configure.ac The check `AC_HEADER_DIRENT` is no longer needed, as all current UNIX systems have the correct version of this header. The checks and corresponding define can be removed. --- cmd/lefty/ws/x11/libfilereq/Dir.c | 22 ---------------------- config.iffe | 1 - configure.ac | 1 - windows/include/config.h | 4 ---- 4 files changed, 28 deletions(-) diff --git a/cmd/lefty/ws/x11/libfilereq/Dir.c b/cmd/lefty/ws/x11/libfilereq/Dir.c index 12a55b7da..1159c4eff 100644 --- a/cmd/lefty/ws/x11/libfilereq/Dir.c +++ b/cmd/lefty/ws/x11/libfilereq/Dir.c @@ -49,29 +49,7 @@ #include "SFinternal.h" -#if HAVE_DIRENT_H #include -#define DIRENT_DONE -#else -#define dirent direct -# if HAVE_SYS_NDIR_H -# include -# define DIRENT_DONE -# endif -# if HAVE_NDIR_H -# include -# define DIRENT_DONE -# endif -#endif - -#ifndef DIRENT_DONE -#if defined (SVR4) || defined (SYSV) || defined (USG) || defined (__osf__) || defined (__svr4__) || defined (__FreeBSD__) || defined (SCO) -#include -#else /* defined (SVR4) || defined (SYSV) || defined (USG) */ -#include -#define dirent direct -#endif /* defined (SVR4) || defined (SYSV) || defined (USG) */ -#endif #include diff --git a/config.iffe b/config.iffe index f898977c0..1f5838cc1 100644 --- a/config.iffe +++ b/config.iffe @@ -20,7 +20,6 @@ lib sincos lib strcasecmp lib strncasecmp -hdr dirent hdr dlfcn hdr errno hdr fenv diff --git a/configure.ac b/configure.ac index 4856562db..af0ea13d1 100644 --- a/configure.ac +++ b/configure.ac @@ -423,7 +423,6 @@ AC_CHECK_HEADERS(malloc.h \ sys/time.h sys/types.h sys/select.h \ sys/stat.h sys/mman.h sys/vfork.h \ sys/ioctl.h sys/inotify.h crt_externs.h) -AC_HEADER_DIRENT # Internationalization macros # AM_GNU_GETTEXT diff --git a/windows/include/config.h b/windows/include/config.h index c023c8d28..3da7df341 100644 --- a/windows/include/config.h +++ b/windows/include/config.h @@ -46,10 +46,6 @@ /* Define if you have the DevIL library */ /* #undef HAVE_DEVIL */ -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - /* Define to 1 if you have the header file. */ /* #undef HAVE_DLFCN_H */ -- 2.40.0