2nd part of Sebastian's patch.

Author: Ilia Alshanetsky

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>

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