summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-06-28 00:13:25 +0200
committerPeter Kokot <peterkokot@gmail.com>2019-06-28 00:13:25 +0200
commit7f994990eab4ffc3eb8cddca413dc4bcd03e3457 (patch)
tree417dd41f6cb9c2c8fbe558c2abc8dc3f923c94ef /win32
parent221494f4de02b8533e4081ca29b6c857c910f087 (diff)
parent638c21765c029f637e45c00a3528ff8ea10c3b72 (diff)
downloadphp-git-7f994990eab4ffc3eb8cddca413dc4bcd03e3457.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Remove HAVE_STRCOLL check
Diffstat (limited to 'win32')
-rw-r--r--win32/build/config.w321
-rw-r--r--win32/build/config.w32.h.in3
2 files changed, 0 insertions, 4 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 38d1fa2295..e01f38b8f3 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -300,7 +300,6 @@ ARG_ENABLE('fd-setsize', "Set maximum number of sockets for select(2)", "256");
ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + parseInt(PHP_FD_SETSIZE));
AC_DEFINE('HAVE_USLEEP', 1);
-AC_DEFINE('HAVE_STRCOLL', 1);
/* For snapshot builders, where can we find the additional
* files that make up the snapshot template? */
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 0403f6c542..3af5fbecf6 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -122,9 +122,6 @@
#define PHP_SHLIB_EXT_PREFIX "php_"
#define HAVE_SQLDATASOURCES
-/* Win32 supports strcoll */
-#define HAVE_STRCOLL 1
-
/* Win32 supports socketpair by the emulation in win32/sockets.c */
#define HAVE_SOCKETPAIR 1
#define HAVE_SOCKLEN_T 1