sniper Wed Feb 19 13:45:04 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main php_scandir.c php_scandir.h
Log:
dirent.h needs to be included always.
Index: php4/main/php_scandir.c
diff -u php4/main/php_scandir.c:1.2.2.5 php4/main/php_scandir.c:1.2.2.6
--- php4/main/php_scandir.c:1.2.2.5 Wed Feb 19 04:28:37 2003
+++ php4/main/php_scandir.c Wed Feb 19 13:45:03 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_scandir.c,v 1.2.2.5 2003/02/19 09:28:37 sniper Exp $ */
+/* $Id: php_scandir.c,v 1.2.2.6 2003/02/19 18:45:03 sniper Exp $ */
#ifdef PHP_WIN32
#include "config.w32.h"
@@ -27,8 +27,6 @@
#include "php_scandir.h"
-#ifndef HAVE_SCANDIR
-
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -36,6 +34,8 @@
#ifdef HAVE_DIRENT_H
#include <dirent.h>
#endif
+
+#ifndef HAVE_SCANDIR
#ifdef PHP_WIN32
#include "win32/readdir.h"
Index: php4/main/php_scandir.h
diff -u php4/main/php_scandir.h:1.2.2.3 php4/main/php_scandir.h:1.2.2.4
--- php4/main/php_scandir.h:1.2.2.3 Wed Feb 19 04:28:37 2003
+++ php4/main/php_scandir.h Wed Feb 19 13:45:03 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_scandir.h,v 1.2.2.3 2003/02/19 09:28:37 sniper Exp $ */
+/* $Id: php_scandir.h,v 1.2.2.4 2003/02/19 18:45:03 sniper Exp $ */
#ifndef PHP_SCANDIR_H
#define PHP_SCANDIR_H
@@ -31,10 +31,11 @@
#include "php_config.h"
#endif
-#ifdef HAVE_SCANDIR
#ifdef HAVE_DIRENT_H
#include <dirent.h>
#endif
+
+#ifdef HAVE_SCANDIR
#define php_scandir scandir
#else
int php_scandir(const char *dirname, struct dirent **namelist[], int (*selector)
(const struct dirent *entry), int (*compare) (const struct dirent **a, const struct
dirent **b));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
