<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/49070e05ef071a6edff4267870dfac1790e9bde0">https://github.com/macports/macports-ports/commit/49070e05ef071a6edff4267870dfac1790e9bde0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 49070e05ef071a6edff4267870dfac1790e9bde0
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 12 15:33:08 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> php82: Update to 8.2.20
</span>---
lang/php/Portfile | 84 +++++++++++-----------
...php82-Wincompatible-function-pointer-types.diff | 75 +++++++++++++++++++
2 files changed, 119 insertions(+), 40 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 df76dd4855c..68f10f61915 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.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.2.20
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 33217ec0d031e411ea802ca6fbe97ab9350238f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aecd63f3ebea6768997f5c4fccd98acbf897762ed5fc25300e846197a9485c13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12094184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d27c88e6aebcc684847dc7d7e707cf805d79dcad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4474cc430febef6de7be958f2c37253e5524d5c5331a7e1765cd2d2234881e50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12097568
</span> }
8.3 {
epoch 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,6 +267,10 @@ if {[is_sapi_subport]} {
</span> patch.pre_args-replace -p0 -p1
patchfiles-append patch-${php}-scripts-php-config.in.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} == 8.2]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-${php}-Wincompatible-function-pointer-types.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {[vercmp ${branch} >= 8.2]} {
patchfiles-append \
patch-${php}-atomic.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -468,7 +472,7 @@ subport ${php} {
</span> 7.4.33 {revision 1}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -629,7 +633,7 @@ subport ${php}-apache2handler {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -693,7 +697,7 @@ subport ${php}-cgi {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -737,7 +741,7 @@ subport ${php}-fpm {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -810,7 +814,7 @@ subport ${php}-calendar {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -834,7 +838,7 @@ subport ${php}-curl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -874,7 +878,7 @@ subport ${php}-dba {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -910,7 +914,7 @@ subport ${php}-enchant {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -963,7 +967,7 @@ subport ${php}-exif {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -980,7 +984,7 @@ subport ${php}-ffi {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1012,7 +1016,7 @@ subport ${php}-ftp {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1050,7 +1054,7 @@ subport ${php}-gd {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1124,7 +1128,7 @@ subport ${php}-gettext {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1154,7 +1158,7 @@ subport ${php}-gmp {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1189,7 +1193,7 @@ subport ${php}-iconv {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1219,7 +1223,7 @@ subport ${php}-imap {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1260,7 +1264,7 @@ subport ${php}-intl {
</span> 7.4.33 {revision 2}
8.0.30 {revision 1}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1323,7 +1327,7 @@ subport ${php}-ipc {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1349,7 +1353,7 @@ subport ${php}-ldap {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1389,7 +1393,7 @@ subport ${php}-mbstring {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1480,7 +1484,7 @@ subport ${php}-mysql {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1712,7 +1716,7 @@ subport ${php}-odbc {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1776,7 +1780,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1836,7 +1840,7 @@ subport ${php}-openssl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1893,7 +1897,7 @@ subport ${php}-oracle {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1935,7 +1939,7 @@ subport ${php}-pcntl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1968,7 +1972,7 @@ subport ${php}-posix {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1995,7 +1999,7 @@ subport ${php}-postgresql {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2141,7 +2145,7 @@ subport ${php}-pspell {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2171,7 +2175,7 @@ subport ${php}-snmp {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2201,7 +2205,7 @@ subport ${php}-soap {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2239,7 +2243,7 @@ subport ${php}-sockets {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2259,7 +2263,7 @@ subport ${php}-sodium {
</span> 7.4.33 {revision 1}
8.0.30 {revision 1}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2298,7 +2302,7 @@ subport ${php}-sqlite {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2350,7 +2354,7 @@ subport ${php}-tidy {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2455,7 +2459,7 @@ subport ${php}-xsl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.19 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.20 {revision 0}
</span> 8.3.7 {revision 0}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-Wincompatible-function-pointer-types.diff b/lang/php/files/patch-php82-Wincompatible-function-pointer-types.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9ebc3394e87
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php82-Wincompatible-function-pointer-types.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,75 @@
</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: incompatible function pointer types initializing 'struct tm *(*)(void)' with an expression of type 'struct tm *(const time_t *restrict, struct tm *restrict)' (aka 'struct tm *(const long *restrict, struct tm *restrict)') [-Werror,-Wincompatible-function-pointer-types]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: incompatible function pointer types initializing 'struct tm *(*)(void)' with an expression of type 'struct tm *(const time_t *restrict, struct tm *restrict)' (aka 'struct tm *(const long *restrict, struct tm *restrict)') [-Werror,-Wincompatible-function-pointer-types]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: incompatible function pointer types initializing 'char *(*)(void)' with an expression of type 'char *(const struct tm *restrict, char *restrict)' [-Werror,-Wincompatible-function-pointer-types]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: incompatible function pointer types initializing 'char *(*)(void)' with an expression of type 'char *(const time_t *, char *)' (aka 'char *(const long *, char *)') [-Werror,-Wincompatible-function-pointer-types]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: incompatible function pointer types initializing 'char *(*)(void)' with an expression of type 'char *(char *, const char *, char **)' [-Werror,-Wincompatible-function-pointer-types]
</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/14315
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/commit/9e226b288106aea3bfb71bae707a3e2d4889e82d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: incompatible function pointer types initializing 'int (*)(void)' with an expression of type 'int (FILE *)' (aka 'int (struct __sFILE *)') [-Werror,-Wincompatible-function-pointer-types]
</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/14549
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/commit/b43378d830872acc6c8515e2815c9f98c7787e62
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/build/php.m4 2024-06-04 09:53:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/build/php.m4 2024-06-13 04:35:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1260,33 +1260,21 @@ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl PHP_MISSING_TIME_R_DECL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFUN([PHP_MISSING_TIME_R_DECL],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([for missing declarations of reentrant functions])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[struct tm *(*func)(void) = localtime_r]])],[
</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;'>+- AC_DEFINE(MISSING_LOCALTIME_R_DECL,1,[Whether localtime_r is declared])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[struct tm *(*func)(void) = gmtime_r]])],[
</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;'>+- AC_DEFINE(MISSING_GMTIME_R_DECL,1,[Whether gmtime_r is declared])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[char *(*func)(void) = asctime_r]])],[
</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;'>+- AC_DEFINE(MISSING_ASCTIME_R_DECL,1,[Whether asctime_r is declared])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[char *(*func)(void) = ctime_r]])],[
</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;'>+- AC_DEFINE(MISSING_CTIME_R_DECL,1,[Whether ctime_r is declared])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], [[char *(*func)(void) = strtok_r]])],[
</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;'>+- AC_DEFINE(MISSING_STRTOK_R_DECL,1,[Whether strtok_r is declared])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([done])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_DECL([localtime_r],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_DEFINE([MISSING_LOCALTIME_R_DECL], [1], [Whether localtime_r is declared])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [#include <time.h>])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_DECL([gmtime_r],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_DEFINE([MISSING_GMTIME_R_DECL], [1], [Whether gmtime_r is declared])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [#include <time.h>])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_DECL([asctime_r],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_DEFINE([MISSING_ASCTIME_R_DECL], [1], [Whether asctime_r is declared])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [#include <time.h>])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_DECL([ctime_r],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_DEFINE([MISSING_CTIME_R_DECL], [1], [Whether ctime_r is declared])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [#include <time.h>])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_DECL([strtok_r],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_DEFINE([MISSING_STRTOK_R_DECL], [1], [Whether strtok_r is declared])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [#include <string.h>])
</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;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1315,7 +1315,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFUN([PHP_MISSING_FCLOSE_DECL],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for fclose declaration])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[int (*func)(void) = fclose]])],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[int (*func)(FILE *) = fclose]])],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(MISSING_FCLOSE_DECL,0,[ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([ok])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ],[
</span></pre><pre style='margin:0'>
</pre>