mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
scandir -> php_scandir, alphasort -> php_alphasort
This commit is contained in:
parent
ec11fe04e9
commit
2b90480fa9
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user