summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2003-01-27 20:39:31 +0000
committerIlia Alshanetsky <iliaa@php.net>2003-01-27 20:39:31 +0000
commitd59d500af7204cf419d91553dccfc2ff0069ca65 (patch)
tree4a7db0482e34008067657447c3e5c1cc19e34215 /main/php_ini.c
parente4ec7372e951f11c1d5696605858e404434782a9 (diff)
downloadphp-git-d59d500af7204cf419d91553dccfc2ff0069ca65.tar.gz
Moved the scandir code into it's own files so that it can be used by other
OSes where libc does not have a native scandir() implementation.
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index ed9ac9cb98..97038fbbcd 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -31,12 +31,10 @@
#include "SAPI.h"
#include "php_main.h"
-#ifdef PHP_WIN32
-#include "readdir.h"
-/* this makes no sence, vc6 errors if this declaration is not here */
-extern int alphasort(const struct dirent **a, const struct dirent **b);
+#if !HAVE_SCANDIR || !HAVE_ALPHASORT
+ #include "php_scandir.h"
#else
-#include "dirent.h"
+ #include <dirent.h>
#endif
#ifndef S_ISREG