MFH: Fix for bug #25295

diff --git a/configure.in b/configure.in
index ef501a3e5d237269fd1c554ccc73d1b63f4675f0..5aca18911b32ef38c97526e8ebdb3583a89bce7a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -317,16 +317,12 @@ dnl -------------------------------------------------------------------------
 
 dnl Checks for header files.
 AC_HEADER_STDC
+AC_HEADER_DIRENT
 
-dnl In QNX opendir resides in libc but dirent.h is still required
-if test "`uname -s 2>/dev/null`" != "QNX"; then
-  AC_HEADER_DIRENT
-else
-  AC_CHECK_HEADERS(dirent.h)
-fi
 PHP_MISSING_FCLOSE_DECL
 dnl QNX requires unix.h to allow functions in libunix to work properly
 AC_CHECK_HEADERS([ \
+dirent.h \
 ApplicationServices/ApplicationServices.h \
 sys/param.h \
 sys/types.h \

diff --git a/main/php_scandir.h b/main/php_scandir.h
index 961188e7ad891e729829969e8f3cb1b9d97fd882..416e3d88cfae9a19b24e4be8d00274d975b3fd43 100644 (file)
--- a/main/php_scandir.h
+++ b/main/php_scandir.h
@@ -24,6 +24,10 @@
 
 #include <sys/types.h>
 
+#ifdef HAVE_SYS_DIR_H
+#include <sys/dir.h>
+#endif
+
 #ifdef PHP_WIN32
 #include "config.w32.h"
 #include "win32/readdir.h"