Merge branch 'PHP-8.3'

* PHP-8.3:
  Fix minimal Windows version
This commit is contained in:
Christoph M. Becker 2024-09-22 19:29:34 +02:00
commit 8c407fc3d0
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
4 changed files with 5 additions and 4 deletions

3
NEWS
View File

@ -61,6 +61,9 @@ PHP NEWS
- TSRM:
. Prevent closing of unrelated handles. (cmb)
- Windows:
. Fixed minimal Windows version. (cmb)
- Zip:
. Added ZipArchive::ER_TRUNCATED_ZIP added in libzip 1.11. (Remi)

View File

@ -6,7 +6,7 @@
#undef _WIN32_WINNT
#undef NTDDI_VERSION
#define _WIN32_WINNT 0x0602
#define NTDDI_VERSION 0x06010000
#define NTDDI_VERSION 0x06020000
/* Default PHP / PEAR directories */
#define PHP_CONFIG_FILE_PATH ""

View File

@ -50,7 +50,7 @@ var PHP_MAKEFILE_FRAGMENTS = PHP_SRC_DIR + "\\Makefile.fragments.w32";
/* Care also about NTDDI_VERSION and _WIN32_WINNT in config.w32.h.in
and manifest. */
var WINVER = "0x0601"; /* 7/2008r2 */
var WINVER = "0x0602"; /* 8/2012 */
// There's a minimum requirement for bison.
var MINBISON = "3.0.0";

View File

@ -9,8 +9,6 @@
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 -->