diff options
| author | foobar <sniper@php.net> | 2003-02-19 18:45:03 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-02-19 18:45:03 +0000 |
| commit | e7b71d3932dcb4e41bf6ed8ebeaf8703ad5f83f7 (patch) | |
| tree | 7a454593342bd2e2412e86e87e0ff7921e7e5c88 /main | |
| parent | 157ab1fd1006381e9cb8d7a22253c949d356e120 (diff) | |
| download | php-git-e7b71d3932dcb4e41bf6ed8ebeaf8703ad5f83f7.tar.gz | |
dirent.h needs to be included always.
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_scandir.c | 4 | ||||
| -rw-r--r-- | main/php_scandir.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/main/php_scandir.c b/main/php_scandir.c index 15d4febf4a..139e1c27cb 100644 --- a/main/php_scandir.c +++ b/main/php_scandir.c @@ -27,8 +27,6 @@ #include "php_scandir.h" -#ifndef HAVE_SCANDIR - #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -37,6 +35,8 @@ #include <dirent.h> #endif +#ifndef HAVE_SCANDIR + #ifdef PHP_WIN32 #include "win32/readdir.h" #endif diff --git a/main/php_scandir.h b/main/php_scandir.h index 4a8b57ed3f..961188e7ad 100644 --- a/main/php_scandir.h +++ b/main/php_scandir.h @@ -31,10 +31,11 @@ #include "php_config.h" #endif -#ifdef HAVE_SCANDIR #ifdef HAVE_DIRENT_H #include <dirent.h> #endif + +#ifdef HAVE_SCANDIR #define php_scandir scandir #else int php_scandir(const char *dirname, struct dirent **namelist[], int (*selector) (const struct dirent *entry), int (*compare) (const struct dirent **a, const struct dirent **b)); |