sniper Wed Feb 19 04:27:29 2003 EDT
Modified files:
/php4/ext/standard dir.c
Log:
scandir -> php_scandir, alphasort -> php_alphasort
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.115 php4/ext/standard/dir.c:1.116
--- php4/ext/standard/dir.c:1.115 Mon Jan 27 20:48:57 2003
+++ php4/ext/standard/dir.c Wed Feb 19 04:27:29 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.115 2003/01/28 01:48:57 iliaa Exp $ */
+/* $Id: dir.c,v 1.116 2003/02/19 09:27:29 sniper Exp $ */
/* {{{ includes/startup/misc */
@@ -24,9 +24,10 @@
#include "fopen_wrappers.h"
#include "file.h"
#include "php_dir.h"
+#include "php_scandir.h"
#ifdef HAVE_DIRENT_H
-# include <dirent.h>
+#include <dirent.h>
#endif
#if HAVE_UNISTD_H
@@ -39,9 +40,6 @@
#include "win32/readdir.h"
#endif
-#if !HAVE_ALPHASORT || !HAVE_SCANDIR
-#include "php_scandir.h"
-#endif
#ifdef HAVE_GLOB
#ifndef PHP_WIN32
@@ -466,9 +464,9 @@
}
if (!flags) {
- n = scandir(path, &namelist, 0, alphasort);
+ n = php_scandir(path, &namelist, 0, php_alphasort);
} else {
- n = scandir(path, &namelist, 0, php_alphasortr);
+ n = php_scandir(path, &namelist, 0, php_alphasortr);
}
if (n < 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
