Move glob to main/ from win32/

In preparation to make the Win32 reimplementation the standard
cross-platform one. Currently, it doesn't do that and just passes
through the original glob implementation. We could consider also having
an option to use the standard glob for systems that have a sufficient
one.

Author: NattyNarwhal

configure.ac

@@ -1631,6 +1631,7 @@ PHP_ADD_SOURCES([main], m4_normalize([
     php_content_types.c
     php_ini_builder.c
     php_ini.c
+    php_glob.c
     php_odbc_utils.c
     php_open_temporary_file.c
     php_scandir.c

ext/ffi/ffi.c

@@ -45,13 +45,7 @@
 #endif
 #endif
 
-#ifdef HAVE_GLOB
-#ifdef PHP_WIN32
-#include "win32/glob.h"
-#else
-#include <glob.h>
-#endif
-#endif
+#include "php_glob.h"
 
 #ifndef __BIGGEST_ALIGNMENT__
 /* XXX need something better, perhaps with regard to SIMD, etc. */

ext/opcache/zend_accelerator_blacklist.c

@@ -30,13 +30,7 @@
 # define REGEX_MODE (REG_EXTENDED|REG_NOSUB)
 #endif
 
-#ifdef HAVE_GLOB
-#ifdef PHP_WIN32
-#include "win32/glob.h"
-#else
-#include <glob.h>
-#endif
-#endif
+#include "php_glob.h"
 
 #include "ext/pcre/php_pcre.h"
 

ext/standard/php_dir_int.h

@@ -17,13 +17,7 @@
 #ifndef PHP_DIR_INT_H
 #define PHP_DIR_INT_H
 
-#ifdef HAVE_GLOB
-#ifndef PHP_WIN32
-#include <glob.h>
-#else
-#include "win32/glob.h"
-#endif
-#endif
+#include "php_glob.h"
 
 #ifdef HAVE_GLOB
 

ext/zip/php_zip.c

@@ -30,13 +30,7 @@
 #include "php_zip.h"
 #include "php_zip_arginfo.h"
 
-#ifdef HAVE_GLOB
-#ifndef PHP_WIN32
-#include <glob.h>
-#else
-#include "win32/glob.h"
-#endif
-#endif
+#include "php_glob.h"
 
 /* {{{ Resource le */
 static int le_zip_dir;

win32/charclass.h renamed to main/charclass.h

@@ -55,6 +55,8 @@
  *	Number of matches in the current invocation of glob.
  */
 
+#if defined(HAVE_GLOB)
+
 #ifdef PHP_WIN32
 #if _MSC_VER < 1800
 # define _POSIX_
@@ -1120,3 +1122,5 @@ static void qprintf(const char *str, Char *s)
 	(void)printf("\n");
 }
 #endif
+
+#endif /* defined(HAVE_GLOB) */

win32/glob.c renamed to main/php_glob.c

@@ -35,6 +35,10 @@
  *	@(#)glob.h	8.1 (Berkeley) 6/2/93
  */
 
+#if defined(HAVE_GLOB)
+#include <glob.h>
+#else
+
 #ifndef _GLOB_H_
 #define	_GLOB_H_
 
@@ -98,3 +102,5 @@ PHPAPI void	globfree(glob_t *);
 END_EXTERN_C()
 
 #endif /* !_GLOB_H_ */
+
+#endif /* defined(HAVE_GLOB) */

win32/glob.h renamed to main/php_glob.h

@@ -17,13 +17,7 @@
 #include "php.h"
 #include "php_streams_int.h"
 
-#ifdef HAVE_GLOB
-# ifndef PHP_WIN32
-#  include <glob.h>
-# else
-#  include "win32/glob.h"
-# endif
-#endif
+#include "php_glob.h"
 
 #ifdef HAVE_GLOB
 #ifndef GLOB_ONLYDIR

main/streams/glob_wrapper.c

@@ -10,9 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <inttypes.h>
-#ifdef HAVE_GLOB
-# include <glob.h>
-#endif
+#include "php_glob.h"
 
 #include <stdio.h>
 #include <unistd.h>

sapi/fpm/fpm/fpm_conf.c

@@ -305,7 +305,7 @@ if (VS_TOOLSET && VCVERS >= 1914) {
 	ADD_FLAG("CFLAGS_BD_MAIN_STREAMS", "/d2FuncCache1");
 }
 
-ADD_SOURCES("win32", "dllmain.c glob.c readdir.c \
+ADD_SOURCES("win32", "dllmain.c readdir.c \
 	registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c \
 	getrusage.c ftok.c ioutil.c codepage.c nice.c \
 	fnmatch.c sockets.c console.c signal.c");