diff options
| author | foobar <sniper@php.net> | 2003-02-19 09:27:29 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-02-19 09:27:29 +0000 |
| commit | 2b90480fa94a0b3409a1ed48d746d8a40e54e5c1 (patch) | |
| tree | 27f34c28ebd9d3474215d3aa128921e4ce245eb9 | |
| parent | ec11fe04e9f0c1d34051efdac8d8ce106878f319 (diff) | |
| download | php-git-2b90480fa94a0b3409a1ed48d746d8a40e54e5c1.tar.gz | |
scandir -> php_scandir, alphasort -> php_alphasort
| -rw-r--r-- | ext/standard/dir.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/standard/dir.c b/ext/standard/dir.c index b274fed410..6ed208372c 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -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 @@ PHP_FUNCTION(scandir) } 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) { |