sniper Mon Sep 8 09:15:45 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src configure.in
/php-src/main php_scandir.h
Log:
MFH: Fix for bug #25295
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.75 php-src/configure.in:1.396.2.76
--- php-src/configure.in:1.396.2.75 Mon Sep 8 09:10:33 2003
+++ php-src/configure.in Mon Sep 8 09:15:43 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.75 2003/09/08 13:10:33 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.76 2003/09/08 13:15:43 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -317,16 +317,12 @@
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 \
Index: php-src/main/php_scandir.h
diff -u php-src/main/php_scandir.h:1.2.2.4 php-src/main/php_scandir.h:1.2.2.5
--- php-src/main/php_scandir.h:1.2.2.4 Wed Feb 19 13:45:03 2003
+++ php-src/main/php_scandir.h Mon Sep 8 09:15:44 2003
@@ -17,12 +17,16 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_scandir.h,v 1.2.2.4 2003/02/19 18:45:03 sniper Exp $ */
+/* $Id: php_scandir.h,v 1.2.2.5 2003/09/08 13:15:44 sniper Exp $ */
#ifndef PHP_SCANDIR_H
#define PHP_SCANDIR_H
#include <sys/types.h>
+
+#ifdef HAVE_SYS_DIR_H
+#include <sys/dir.h>
+#endif
#ifdef PHP_WIN32
#include "config.w32.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
