<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5131828b0499c108e064ea0139807b9ac85f2040">https://github.com/macports/macports-ports/commit/5131828b0499c108e064ea0139807b9ac85f2040</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5131828b0499c108e064ea0139807b9ac85f2040
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Aug 8 20:22:25 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> php83: Update to 8.3.0beta2
</span>---
lang/php/Portfile | 82 +++++++++++++-------------
lang/php/files/patch-php83-atomic.diff | 104 ++++++++++-----------------------
2 files changed, 71 insertions(+), 115 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fdeef0a9c8..b069e36ff49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,13 +189,13 @@ switch ${subport_branch} {
</span> # master_sites and livecheck, and update php.latest_stable_branch in the
# php-1.1 portgroup.
epoch 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.3.0beta1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.3.0beta2
</span> homepage https://qa.php.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://downloads.php.net/~eric/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://downloads.php.net/~jakub/
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 eaa2233d95cf561d613aadd66acb5a08ff8fea8b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7998e1c2a90fd51932ce9579b8c53151691788f1110601ad99a5fae56843765f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12369024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b53d7e110f778a00708fcb4cc51a7313ecff94d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 343d4e96648cb41c5313fd2a7e0cb70b3fe0174f1e233c9d5365bf78a839f304 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12358628
</span> livecheck.url ${homepage}
livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -437,7 +437,7 @@ subport ${php} {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -598,7 +598,7 @@ subport ${php}-apache2handler {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,7 +666,7 @@ subport ${php}-cgi {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -710,7 +710,7 @@ subport ${php}-fpm {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -783,7 +783,7 @@ subport ${php}-calendar {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -807,7 +807,7 @@ subport ${php}-curl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -847,7 +847,7 @@ subport ${php}-dba {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -883,7 +883,7 @@ subport ${php}-enchant {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -936,7 +936,7 @@ subport ${php}-exif {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -953,7 +953,7 @@ subport ${php}-ffi {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -985,7 +985,7 @@ subport ${php}-ftp {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1023,7 +1023,7 @@ subport ${php}-gd {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1089,7 +1089,7 @@ subport ${php}-gettext {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1119,7 +1119,7 @@ subport ${php}-gmp {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1154,7 +1154,7 @@ subport ${php}-iconv {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1184,7 +1184,7 @@ subport ${php}-imap {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1225,7 +1225,7 @@ subport ${php}-intl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1288,7 +1288,7 @@ subport ${php}-ipc {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1314,7 +1314,7 @@ subport ${php}-ldap {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1354,7 +1354,7 @@ subport ${php}-mbstring {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1445,7 +1445,7 @@ subport ${php}-mysql {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1641,7 +1641,7 @@ subport ${php}-odbc {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1705,7 +1705,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1761,7 +1761,7 @@ subport ${php}-openssl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1818,7 +1818,7 @@ subport ${php}-oracle {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1860,7 +1860,7 @@ subport ${php}-pcntl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1893,7 +1893,7 @@ subport ${php}-posix {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1920,7 +1920,7 @@ subport ${php}-postgresql {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2066,7 +2066,7 @@ subport ${php}-pspell {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2096,7 +2096,7 @@ subport ${php}-snmp {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2126,7 +2126,7 @@ subport ${php}-soap {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2159,7 +2159,7 @@ subport ${php}-sockets {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2179,7 +2179,7 @@ subport ${php}-sodium {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2218,7 +2218,7 @@ subport ${php}-sqlite {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2270,7 +2270,7 @@ subport ${php}-tidy {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2375,7 +2375,7 @@ subport ${php}-xsl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.8 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta2 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-atomic.diff b/lang/php/files/patch-php83-atomic.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 817caa82754..781cc717915 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php83-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php83-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +1,32 @@
</span> See https://github.com/php/php-src/issues/8881
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Based on https://github.com/php/php-src/commit/f33d6cfb98790c7e38d8cdd5b343f42180064698.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Zend/zend_atomic.c.orig 2022-11-22 12:07:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Zend/zend_atomic.c 2022-12-06 14:46:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,13 +35,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- zend_atomic_bool_store_ex(obj, desired);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(ZEND_WIN32) || defined(HAVE_SYNC_ATOMICS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* On these platforms it is non-const due to underlying APIs. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ZEND_API bool zend_atomic_bool_load(zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return zend_atomic_bool_load_ex(obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ZEND_API bool zend_atomic_bool_load(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return zend_atomic_bool_load_ex(obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Zend/zend_atomic.h.orig 2022-11-22 12:07:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Zend/zend_atomic.h 2022-12-06 14:48:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,10 +70,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return InterlockedExchange8(&obj->value, desired);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* On this platform it is non-const due to Iterlocked API*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static zend_always_inline bool zend_atomic_bool_load_ex(zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static zend_always_inline bool zend_atomic_bool_load_ex(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Or'ing with false won't change the value. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return InterlockedOr8(&obj->value, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return InterlockedOr8(&((zend_atomic_bool *) obj)->value, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static zend_always_inline void zend_atomic_bool_store_ex(zend_atomic_bool *obj, bool desired) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +88,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static zend_always_inline bool zend_atomic_bool_load_ex(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return __c11_atomic_load(&obj->value, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return __c11_atomic_load(&((zend_atomic_bool *) obj)->value, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static zend_always_inline void zend_atomic_bool_store_ex(zend_atomic_bool *obj, bool desired) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static zend_always_inline bool zend_atomic_bool_load_ex(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool prev = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- __atomic_load(&obj->value, &prev, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __atomic_load(&((zend_atomic_bool *) obj)->value, &prev, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return prev;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,9 +129,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return prev;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static zend_always_inline bool zend_atomic_bool_load_ex(zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static zend_always_inline bool zend_atomic_bool_load_ex(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Or'ing false won't change the value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return __sync_fetch_and_or(&obj->value, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return __sync_fetch_and_or(&((zend_atomic_bool *) obj)->value, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static zend_always_inline void zend_atomic_bool_store_ex(zend_atomic_bool *obj, bool desired) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -167,12 +166,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ZEND_API bool zend_atomic_bool_exchange(zend_atomic_bool *obj, bool desired);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ZEND_API void zend_atomic_bool_store(zend_atomic_bool *obj, bool desired);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(ZEND_WIN32) || defined(HAVE_SYNC_ATOMICS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* On these platforms it is non-const due to underlying APIs. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ZEND_API bool zend_atomic_bool_load(zend_atomic_bool *obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ZEND_API bool zend_atomic_bool_load(const zend_atomic_bool *obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- END_EXTERN_C()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Zend/zend_atomic.h.orig 2023-08-01 06:07:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Zend/zend_atomic.h 2023-08-08 23:24:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,8 +23,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Builtins are used to avoid library linkage */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __has_feature(c_atomic)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define HAVE_C11_ATOMICS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __has_feature(c_atomic) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201710L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_C17_ATOMICS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif ZEND_GCC_PREREQ(4, 7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_GNUC_ATOMICS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct zend_atomic_bool_s {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ volatile char value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } zend_atomic_bool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(HAVE_C11_ATOMICS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(HAVE_C17_ATOMICS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct zend_atomic_bool_s {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _Atomic(bool) value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } zend_atomic_bool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (void)InterlockedExchange8(&obj->value, desired);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(HAVE_C11_ATOMICS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(HAVE_C17_ATOMICS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ZEND_ATOMIC_BOOL_INIT(obj, desired) __c11_atomic_init(&(obj)->value, (desired))
</span>
</pre><pre style='margin:0'>
</pre>