From: Peter Kokot <peterkokot@gmail.com>
Date: Sat, 13 Apr 2019 02:45:28 +0000 (+0200)
Subject: Remove PHP_READDIR_R_TYPE
X-Git-Tag: php-7.4.0alpha1~506
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=769db42341845544eebd4c939ecdaf87ce711d85;p=php

Remove PHP_READDIR_R_TYPE

The PHP_READDIR_R_TYPE m4 macro has been removed via
2b28f7189144a21e753dbc09efadd571121a82b9.

HAVE_POSIX_READDIR_R in windows header file is also not needed anymore.
---

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index afa4ed91e4..930cd4e4fb 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -218,7 +218,7 @@ PHP 7.4 INTERNALS UPGRADE NOTES
     - Local PHP m4 unused or obsolete macros have been removed:
       PHP_TARGET_RDYNAMIC, PHP_SOLARIS_PIC_WEIRDNESS, PHP_SYS_LFS,
       PHP_AC_BROKEN_SPRINTF, PHP_EXTENSION, PHP_DECLARED_TIMEZONE,
-      PHP_CHECK_TYPES, PHP_TM_GMTOFF, PHP_CHECK_64BIT.
+      PHP_CHECK_TYPES, PHP_TM_GMTOFF, PHP_CHECK_64BIT, PHP_READDIR_R_TYPE.
     - new --enable-rtld-now build option allow to switch dlopen behavior
       from RTLD_LAZY to RTLD_NOW
     - Minimum Bison version is 3.0+ for generating parser files.
diff --git a/configure.ac b/configure.ac
index 473c05192b..293c5fc33f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -717,7 +717,6 @@ fi
 AC_REPLACE_FUNCS(strlcat strlcpy explicit_bzero getopt)
 AC_FUNC_ALLOCA
 PHP_TIME_R_TYPE
-PHP_READDIR_R_TYPE
 PHP_CHECK_IN_ADDR_T
 
 AC_CHECK_FUNCS(crypt_r, [ php_crypt_r="1" ], [ php_crypt_r="0" ])
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 06632b0e20..0403f6c542 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -50,7 +50,6 @@
 
 #define HAVE_GETHOSTNAME 1
 #define HAVE_GETCWD 1
-#define HAVE_POSIX_READDIR_R 1
 #define NEED_ISBLANK 1
 #define DISCARD_PATH 0
 #undef HAVE_SETITIMER