diff options
Diffstat (limited to 'ext/standard/dir.c')
| -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) { |