From: foobar <sniper@php.net>
Date: Wed, 19 Feb 2003 09:27:29 +0000 (+0000)
Subject: scandir -> php_scandir, alphasort -> php_alphasort
X-Git-Tag: RELEASE_0_5~880
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b90480fa94a0b3409a1ed48d746d8a40e54e5c1;p=php

scandir -> php_scandir, alphasort -> php_alphasort
---

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) {