<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/0fda3c2df56ccb77e62a038fdd45495f29b350da">https://github.com/macports/macports-ports/commit/0fda3c2df56ccb77e62a038fdd45495f29b350da</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0fda3c2df56ccb77e62a038fdd45495f29b350da
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jul 21 19:43:58 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> php83: Update to 8.3.9
</span>---
lang/php/Portfile | 84 +++++++++++-----------
...php83-Wincompatible-function-pointer-types.diff | 75 -------------------
2 files changed, 40 insertions(+), 119 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 ac025c84476..a50feb9d348 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;'>@@ -186,11 +186,11 @@ switch ${subport_branch} {
</span> }
8.3 {
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.3.9
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 ed08b1c6a861dead427d438814e8d39307e3066f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aea358b56186f943c2bbd350c9005b9359133d47e954cfc561385319ae5bb8d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12480896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9c269526927389d4ac39f3d5feeadaa8ef3319a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bf4d7b8ea60a356064f88485278bd6f941a230ec16f0fc401574ce1445ad6c77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12470616
</span> }
8.4 {
# When this becomes a stable version, remove the overrides for homepage,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,10 +267,6 @@ 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:#ffe0e0;'>- if {[vercmp ${branch} >= 8.3]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-${php}-Wincompatible-function-pointer-types.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {[vercmp ${branch} >= 8.2]} {
patchfiles-append \
patch-${php}-atomic.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -473,7 +469,7 @@ subport ${php} {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -634,7 +630,7 @@ subport ${php}-apache2handler {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -698,7 +694,7 @@ subport ${php}-cgi {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -742,7 +738,7 @@ subport ${php}-fpm {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -815,7 +811,7 @@ subport ${php}-calendar {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -839,7 +835,7 @@ subport ${php}-curl {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -879,7 +875,7 @@ subport ${php}-dba {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -915,7 +911,7 @@ subport ${php}-enchant {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -968,7 +964,7 @@ subport ${php}-exif {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -985,7 +981,7 @@ subport ${php}-ffi {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1017,7 +1013,7 @@ subport ${php}-ftp {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1055,7 +1051,7 @@ subport ${php}-gd {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1129,7 +1125,7 @@ subport ${php}-gettext {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1159,7 +1155,7 @@ subport ${php}-gmp {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1194,7 +1190,7 @@ subport ${php}-iconv {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1224,7 +1220,7 @@ subport ${php}-imap {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1265,7 +1261,7 @@ subport ${php}-intl {
</span> 8.0.30 {revision 1}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1328,7 +1324,7 @@ subport ${php}-ipc {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1354,7 +1350,7 @@ subport ${php}-ldap {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1394,7 +1390,7 @@ subport ${php}-mbstring {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1485,7 +1481,7 @@ subport ${php}-mysql {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1717,7 +1713,7 @@ subport ${php}-odbc {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1781,7 +1777,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1841,7 +1837,7 @@ subport ${php}-openssl {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1898,7 +1894,7 @@ subport ${php}-oracle {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1940,7 +1936,7 @@ subport ${php}-pcntl {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1973,7 +1969,7 @@ subport ${php}-posix {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2000,7 +1996,7 @@ subport ${php}-postgresql {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2146,7 +2142,7 @@ subport ${php}-pspell {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2176,7 +2172,7 @@ subport ${php}-snmp {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2206,7 +2202,7 @@ subport ${php}-soap {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2244,7 +2240,7 @@ subport ${php}-sockets {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2264,7 +2260,7 @@ subport ${php}-sodium {
</span> 8.0.30 {revision 1}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2303,7 +2299,7 @@ subport ${php}-sqlite {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2355,7 +2351,7 @@ subport ${php}-tidy {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2460,7 +2456,7 @@ subport ${php}-xsl {
</span> 8.0.30 {revision 0}
8.1.29 {revision 0}
8.2.21 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.8 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.9 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-Wincompatible-function-pointer-types.diff b/lang/php/files/patch-php83-Wincompatible-function-pointer-types.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9ebc3394e87..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php83-Wincompatible-function-pointer-types.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-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:#ffe0e0;'>-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:#ffe0e0;'>-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:#ffe0e0;'>-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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/issues/14315
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/commit/9e226b288106aea3bfb71bae707a3e2d4889e82d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/issues/14549
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/commit/b43378d830872acc6c8515e2815c9f98c7787e62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/build/php.m4 2024-06-04 09:53:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/build/php.m4 2024-06-13 04:35:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1260,33 +1260,21 @@ dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl PHP_MISSING_TIME_R_DECL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFUN([PHP_MISSING_TIME_R_DECL],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_CHECKING([for missing declarations of reentrant functions])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[struct tm *(*func)(void) = localtime_r]])],[
</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;'>-- AC_DEFINE(MISSING_LOCALTIME_R_DECL,1,[Whether localtime_r is declared])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[struct tm *(*func)(void) = gmtime_r]])],[
</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;'>-- AC_DEFINE(MISSING_GMTIME_R_DECL,1,[Whether gmtime_r is declared])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[char *(*func)(void) = asctime_r]])],[
</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;'>-- AC_DEFINE(MISSING_ASCTIME_R_DECL,1,[Whether asctime_r is declared])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[char *(*func)(void) = ctime_r]])],[
</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;'>-- AC_DEFINE(MISSING_CTIME_R_DECL,1,[Whether ctime_r is declared])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], [[char *(*func)(void) = strtok_r]])],[
</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;'>-- AC_DEFINE(MISSING_STRTOK_R_DECL,1,[Whether strtok_r is declared])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_RESULT([done])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_DECL([localtime_r],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_DEFINE([MISSING_LOCALTIME_R_DECL], [1], [Whether localtime_r is declared])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [#include <time.h>])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_DECL([gmtime_r],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_DEFINE([MISSING_GMTIME_R_DECL], [1], [Whether gmtime_r is declared])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [#include <time.h>])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_DECL([asctime_r],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_DEFINE([MISSING_ASCTIME_R_DECL], [1], [Whether asctime_r is declared])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [#include <time.h>])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_DECL([ctime_r],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_DEFINE([MISSING_CTIME_R_DECL], [1], [Whether ctime_r is declared])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [#include <time.h>])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_DECL([strtok_r],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_DEFINE([MISSING_STRTOK_R_DECL], [1], [Whether strtok_r is declared])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [#include <string.h>])
</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;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1315,7 +1315,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFUN([PHP_MISSING_FCLOSE_DECL],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([for fclose declaration])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[int (*func)(void) = fclose]])],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[int (*func)(FILE *) = fclose]])],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(MISSING_FCLOSE_DECL,0,[ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT([ok])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ],[
</span></pre><pre style='margin:0'>
</pre>