Module: wine Branch: master Commit: f8faa8ced5f57b3dad269baeae6ce522fd065a47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8faa8ced5f57b3dad269baea...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 9 10:53:44 2021 +0100
configure: Assume that dirent.h is available on Unix.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 6 ------ configure.ac | 1 - dlls/nsiproxy.sys/tcp.c | 10 ++-------- dlls/win32u/freetype.c | 4 +--- dlls/wineps.drv/mkagl.c | 4 +--- include/config.h.in | 3 --- 6 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/configure b/configure index 82fa88755bd..c2f114b9a0e 100755 --- a/configure +++ b/configure @@ -8251,12 +8251,6 @@ if test "x$ac_cv_header_asm_user_h" = xyes then : printf "%s\n" "#define HAVE_ASM_USER_H 1" >>confdefs.h
-fi -ac_fn_c_check_header_compile "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "$ac_includes_default" -if test "x$ac_cv_header_dirent_h" = xyes -then : - printf "%s\n" "#define HAVE_DIRENT_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" if test "x$ac_cv_header_elf_h" = xyes diff --git a/configure.ac b/configure.ac index 4fdb1ef33df..d023f77a275 100644 --- a/configure.ac +++ b/configure.ac @@ -434,7 +434,6 @@ AC_CHECK_HEADERS(\ arpa/nameser.h \ asm/types.h \ asm/user.h \ - dirent.h \ elf.h \ float.h \ gettext-po.h \ diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 1ed80afbe4b..9a089ba3de2 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -25,19 +25,13 @@
#include "config.h" #include <stdarg.h> +#include <sys/types.h> +#include <dirent.h>
#ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif
-#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif - -#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif - #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 3894478a846..48fae25a87e 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -37,9 +37,7 @@ # include <sys/mman.h> #endif #include <string.h> -#ifdef HAVE_DIRENT_H -# include <dirent.h> -#endif +#include <dirent.h> #include <stdio.h> #include <assert.h> #include <unistd.h> diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index d3ca67ee37d..ca9702656ae 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -19,9 +19,7 @@ #include "config.h"
#include <sys/types.h> -#ifdef HAVE_DIRENT_H -# include <dirent.h> -#endif +#include <dirent.h> #include <string.h> #include <stdlib.h> #include <stdio.h> diff --git a/include/config.h.in b/include/config.h.in index a0165765a85..2affc4d6329 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -49,9 +49,6 @@ /* Define to 1 if you have the <cups/ppd.h> header file. */ #undef HAVE_CUPS_PPD_H
-/* Define to 1 if you have the <dirent.h> header file. */ -#undef HAVE_DIRENT_H - /* Define to 1 if you have the <DiskArbitration/DiskArbitration.h> header file. */ #undef HAVE_DISKARBITRATION_DISKARBITRATION_H