Skip to content

Commit c342c9b

Browse files
committed
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
1 parent c08e1d2 commit c342c9b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ PHP NEWS
66
. Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11).
77
(Dmitry, Laruence)
88

9+
- Opcache:
10+
. Fixed bug # 64490 (struct flock undefined on FreeBSD). (Joe Watkins)
11+
912
21 Mar 2013, PHP 5.5.0 Beta 1
1013

1114
- Core:

ext/opcache/ZendAccelerator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
#ifndef ZEND_WIN32
9494
extern int lock_file;
9595

96-
# if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__)/* Darwin */) || defined(__OpenBSD__) || defined(__NetBSD__)
96+
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (defined(__APPLE__) && defined(__MACH__)/* Darwin */) || defined(__OpenBSD__) || defined(__NetBSD__)
9797
# define FLOCK_STRUCTURE(name, type, whence, start, len) \
9898
struct flock name = {start, len, -1, type, whence}
9999
# elif defined(__svr4__)

0 commit comments

Comments
 (0)