From c2af281c0c2dba355eb342b4871df2bc09665c19 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Mon, 7 Jul 2025 09:40:03 +0200
Subject: [PATCH] Use <winsock2.h> instead of legacy <winsock.h> (#19037)

This also omits defining unused HAVE_WINSOCK_H macro when building
ext/sockets.
---
 ext/mysqlnd/mysqlnd_vio.c | 2 +-
 ext/sockets/config.w32    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ext/mysqlnd/mysqlnd_vio.c b/ext/mysqlnd/mysqlnd_vio.c
index 67210f083a9..3a3f7b20721 100644
--- a/ext/mysqlnd/mysqlnd_vio.c
+++ b/ext/mysqlnd/mysqlnd_vio.c
@@ -26,7 +26,7 @@
 #ifndef PHP_WIN32
 #include <netinet/tcp.h>
 #else
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 
 
diff --git a/ext/sockets/config.w32 b/ext/sockets/config.w32
index 10400985af5..727d0c06fb6 100644
--- a/ext/sockets/config.w32
+++ b/ext/sockets/config.w32
@@ -4,8 +4,7 @@ ARG_ENABLE("sockets", "SOCKETS support", "no");
 
 if (PHP_SOCKETS != "no") {
 	if (CHECK_LIB("ws2_32.lib", "sockets", PHP_SOCKETS)
-	&& CHECK_LIB("Iphlpapi.lib", "sockets", PHP_SOCKETS)
-	&& CHECK_HEADER_ADD_INCLUDE("winsock.h", "CFLAGS_SOCKETS")) {
+	&& CHECK_LIB("Iphlpapi.lib", "sockets", PHP_SOCKETS)) {
 		EXTENSION('sockets', 'sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c', PHP_SOCKETS_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 		AC_DEFINE('HAVE_SOCKETS', 1, "Define to 1 if the PHP extension 'sockets' is available.");
 		PHP_INSTALL_HEADERS("ext/sockets", "php_sockets.h windows_common.h");