main: move flock_compat files to main/

configure.ac

@@ -1654,6 +1654,7 @@ PHP_ADD_SOURCES([TSRM], m4_normalize([
 
 PHP_ADD_SOURCES([main], m4_normalize([
     explicit_bzero.c
+    flock_compat.c
     fopen_wrappers.c
     getopt.c
     main.c

ext/dba/dba.c

@@ -30,7 +30,7 @@
 
 #include "php_dba.h"
 #include "ext/standard/info.h"
-#include "ext/standard/flock_compat.h" /* Compatibility for Windows */
+#include "main/flock_compat.h" /* Compatibility for Windows */
 
 #include "php_gdbm.h"
 #include "php_ndbm.h"

ext/session/mod_files.c

@@ -75,7 +75,7 @@
 
 #include "php_session.h"
 #include "mod_files.h"
-#include "ext/standard/flock_compat.h"
+#include "main/flock_compat.h"
 #include "php_open_temporary_file.h"
 
 #define FILE_PREFIX "sess_"

ext/spl/spl_directory.c

@@ -19,7 +19,7 @@
 #include "php.h"
 #include "ext/standard/file.h"
 #include "ext/standard/php_filestat.h"
-#include "ext/standard/flock_compat.h"
+#include "main/flock_compat.h"
 #include "ext/standard/scanf.h"
 #include "ext/standard/php_string.h" /* For php_basename() */
 #include "zend_exceptions.h"

ext/standard/config.m4

@@ -405,7 +405,6 @@ PHP_NEW_EXTENSION([standard], m4_normalize([
     file.c
     filestat.c
     filters.c
-    flock_compat.c
     formatted_print.c
     fsock.c
     ftok.c

ext/standard/config.w32

@@ -35,7 +35,7 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
 	url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \
 	php_fopen_wrapper.c credits.c css.c var_unserializer.c ftok.c sha1.c \
 	user_filters.c uuencode.c filters.c proc_open.c password.c \
-	streamsfuncs.c http.c flock_compat.c hrtime.c",
+	streamsfuncs.c http.c hrtime.c",
 	false /* never shared */);
 ADD_SOURCES("ext/standard/libavifinfo", "avifinfo.c", "standard");
 PHP_STANDARD = "yes";

ext/standard/file.c

@@ -20,7 +20,7 @@
 /* {{{ includes */
 
 #include "php.h"
-#include "ext/standard/flock_compat.h"
+#include "main/flock_compat.h"
 #include "ext/standard/php_filestat.h"
 #include "php_open_temporary_file.h"
 #include "ext/standard/basic_functions.h"

ext/standard/streamsfuncs.c

@@ -14,7 +14,7 @@
 */
 
 #include "php.h"
-#include "ext/standard/flock_compat.h"
+#include "main/flock_compat.h"
 #include "ext/standard/file.h"
 #include "ext/standard/basic_functions.h"
 #include "php_ini.h"

ext/standard/flock_compat.c → main/flock_compat.c

@@ -14,7 +14,7 @@
 
 #include "php.h"
 #include <errno.h>
-#include "ext/standard/flock_compat.h"
+#include "flock_compat.h"
 
 #ifndef HAVE_FLOCK
 PHPAPI int flock(int fd, int operation)

main/main.c

@@ -60,7 +60,7 @@
 #ifdef PHP_WIN32
 #include <io.h>
 #include "win32/php_registry.h"
-#include "ext/standard/flock_compat.h"
+#include "flock_compat.h"
 #endif
 #include "Zend/zend_builtin_functions.h"
 #include "Zend/zend_exceptions.h"

main/streams/plain_wrapper.c

@@ -17,7 +17,7 @@
 #include "php_network.h"
 #include "php_open_temporary_file.h"
 #include "ext/standard/file.h"
-#include "ext/standard/flock_compat.h"
+#include "main/flock_compat.h"
 #include "ext/standard/php_filestat.h"
 #include <stddef.h>
 #include <fcntl.h>

main/streams/userspace.c

@@ -16,7 +16,7 @@
 #include "php.h"
 #include "php_globals.h"
 #include "ext/standard/file.h"
-#include "ext/standard/flock_compat.h"
+#include "main/flock_compat.h"
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif

win32/build/config.w32

@@ -286,7 +286,7 @@ if (TARGET_ARCH == 'x64') {
 
 ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 
-ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
+ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c flock_compat.c fopen_wrappers.c \
 	php_ini_builder.c php_glob.c \
 	php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
 	strlcat.c reentrancy.c php_variables.c php_ticks.c network.c \