<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/4b2e8ad51e73117eeefec79b5fe2c3f2cc51ea4d">https://github.com/macports/macports-ports/commit/4b2e8ad51e73117eeefec79b5fe2c3f2cc51ea4d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4b2e8ad51e73117eeefec79b5fe2c3f2cc51ea4d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 18 16:31:15 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> php82: Update to 8.2.9
</span>---
lang/php/Portfile | 80 ++++++++++++------------
lang/php/files/patch-php82-atomic.diff | 111 +++++++++++----------------------
2 files changed, 76 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 b069e36ff49..33d7a62934f 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;'>@@ -178,11 +178,11 @@ switch ${subport_branch} {
</span> }
8.2 {
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.2.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.2.9
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0805516c33b399e89b3c64a04d0f71c0a4426f54 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12034856
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 bc4f007d5a34397a8898ac76b8d0bea4be46ce51 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12035468
</span> }
8.3 {
# When this becomes a stable version, remove the overrides for homepage,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -436,7 +436,7 @@ subport ${php} {
</span> 7.4.33 {revision 1}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,7 +597,7 @@ subport ${php}-apache2handler {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -665,7 +665,7 @@ subport ${php}-cgi {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -709,7 +709,7 @@ subport ${php}-fpm {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -782,7 +782,7 @@ subport ${php}-calendar {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -806,7 +806,7 @@ subport ${php}-curl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -846,7 +846,7 @@ subport ${php}-dba {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -882,7 +882,7 @@ subport ${php}-enchant {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -935,7 +935,7 @@ subport ${php}-exif {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -952,7 +952,7 @@ subport ${php}-ffi {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -984,7 +984,7 @@ subport ${php}-ftp {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1022,7 +1022,7 @@ subport ${php}-gd {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1088,7 +1088,7 @@ subport ${php}-gettext {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1118,7 +1118,7 @@ subport ${php}-gmp {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1153,7 +1153,7 @@ subport ${php}-iconv {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1183,7 +1183,7 @@ subport ${php}-imap {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1224,7 +1224,7 @@ subport ${php}-intl {
</span> 7.4.33 {revision 1}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1287,7 +1287,7 @@ subport ${php}-ipc {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1313,7 +1313,7 @@ subport ${php}-ldap {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1353,7 +1353,7 @@ subport ${php}-mbstring {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1444,7 +1444,7 @@ subport ${php}-mysql {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1640,7 +1640,7 @@ subport ${php}-odbc {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1704,7 +1704,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1760,7 +1760,7 @@ subport ${php}-openssl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1817,7 +1817,7 @@ subport ${php}-oracle {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1859,7 +1859,7 @@ subport ${php}-pcntl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1892,7 +1892,7 @@ subport ${php}-posix {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1919,7 +1919,7 @@ subport ${php}-postgresql {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2065,7 +2065,7 @@ subport ${php}-pspell {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2095,7 +2095,7 @@ subport ${php}-snmp {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2125,7 +2125,7 @@ subport ${php}-soap {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2158,7 +2158,7 @@ subport ${php}-sockets {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2178,7 +2178,7 @@ subport ${php}-sodium {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2217,7 +2217,7 @@ subport ${php}-sqlite {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2269,7 +2269,7 @@ subport ${php}-tidy {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2374,7 +2374,7 @@ subport ${php}-xsl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.22 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.9 {revision 0}
</span> 8.3.0beta2 {revision 0}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-atomic.diff b/lang/php/files/patch-php82-atomic.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 817caa82754..d38df9d75c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php82-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php82-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +1,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://github.com/php/php-src/issues/8881
</span><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;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: address argument to atomic operation must be a pointer to non-const _Atomic type ('const _Atomic(bool) *' invalid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/8881
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/11931
</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>