2nd part of Sebastian's patch.

diff --git a/main/php_scandir.c b/main/php_scandir.c
index 8974a698893fd447aee18b6cf80775a06968966d..a467a42bb92501672997eee42302008077a9a36c 100644 (file)
--- a/main/php_scandir.c
+++ b/main/php_scandir.c
@@ -18,7 +18,11 @@
  */
 
 #include "php_scandir.h"
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#else
 #include "php_config.h"
+#endif
 
 #ifndef HAVE_SCANDIR
  #include <sys/types.h>

diff --git a/main/php_scandir.h b/main/php_scandir.h
index a658ad02a9946698344a31b86ac42ac119bd2371..b7a2b9e78b43306d87c9c9123e66eb31a9eaae69 100644 (file)
--- a/main/php_scandir.h
+++ b/main/php_scandir.h
@@ -1,12 +1,14 @@
 #include <sys/types.h>
-#include "php_config.h"
 
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 #endif
 
 #ifdef PHP_WIN32
+#include "config.w32.h"
 #include "win32/readdir.h"
+#else
+#include "php_config.h"
 #endif
 
 #ifndef HAVE_ALPHASORT