From 8476774a7bf02dc18fe8daaf1be5b2157c6c0293 Mon Sep 17 00:00:00 2001 From: Dylan T Date: Wed, 7 Feb 2024 20:13:07 +0000 Subject: [PATCH] Fixed merge error --- compile.sh | 2 +- windows-compile-vs.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compile.sh b/compile.sh index 253ea95f..da1b1507 100755 --- a/compile.sh +++ b/compile.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -[ -z "$PHP_VERSION" ] && PHP_VERSION="8.2.13" +[ -z "$PHP_VERSION" ] && PHP_VERSION="8.3.0" ZLIB_VERSION="1.3" GMP_VERSION="6.3.0" diff --git a/windows-compile-vs.bat b/windows-compile-vs.bat index 2f6cf92c..b991b916 100644 --- a/windows-compile-vs.bat +++ b/windows-compile-vs.bat @@ -2,8 +2,8 @@ REM For future users: This file MUST have CRLF line endings. If it doesn't, lots of inexplicable undesirable strange behaviour will result. REM Also: Don't modify this version with sed, or it will screw up your line endings. -set PHP_MAJOR_VER=8.2 -set PHP_VER=%PHP_MAJOR_VER%.13 +set PHP_MAJOR_VER=8.3 +set PHP_VER=%PHP_MAJOR_VER%.0 set PHP_GIT_REV=php-%PHP_VER% set PHP_DISPLAY_VER=%PHP_VER% set PHP_SDK_VER=2.2.0