Skip to content

Commit a077c2d

Browse files
committed
Merge branch 'PHP-8.2'
2 parents d9db446 + 0309800 commit a077c2d

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
@@ -13,6 +13,7 @@ PHP NEWS
1313
exceptions). (ilutov)
1414
. Added zend_call_stack_get implementation for OpenBSD. (David Carlier)
1515
. Fixed oss-fuzz #60411 (Fix double-compilation of arrow-functions). (ilutov)
16+
. Fixed build for FreeBSD before the 11.0 releases. (David Carlier)
1617

1718
- DOM:
1819
. Added DOMNode::contains() and DOMNameSpaceNode::contains(). (nielsdos)

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)