Skip to content

Commit 0309800

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents 1e41b0f + 69b4360 commit 0309800

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ PHP NEWS
1515
. Fixed line number of JMP instruction over else block. (ilutov)
1616
. Fixed use-of-uninitialized-value with ??= on assert. (ilutov)
1717
. Fixed oss-fuzz #60411 (Fix double-compilation of arrow-functions). (ilutov)
18+
. Fixed build for FreeBSD before the 11.0 releases. (David Carlier)
1819

1920
- Curl:
2021
. Fix crash when an invalid callback function is passed to

Zend/zend_gdb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <fcntl.h>
2626
#include <unistd.h>
2727

28-
#if defined(__FreeBSD__)
28+
#if defined(__FreeBSD__) && __FreeBSD_version >= 1100000
2929
# include <sys/user.h>
3030
# include <libutil.h>
3131
#endif
@@ -142,7 +142,7 @@ ZEND_API bool zend_gdb_present(void)
142142

143143
close(fd);
144144
}
145-
#elif defined(__FreeBSD__)
145+
#elif defined(__FreeBSD__) && __FreeBSD_version >= 1100000
146146
struct kinfo_proc *proc = kinfo_getproc(getpid());
147147

148148
if (proc) {

0 commit comments

Comments
 (0)