diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-03-24 19:03:04 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-03-24 19:07:30 -0700 |
| commit | c342c9b96452c5660c32a6c1a34d9dab9066afef (patch) | |
| tree | ec28d4c56c384b4897dd55c4fcdde0baa18c9b5e | |
| parent | c08e1d2be948d63f7a9309344a0ed4092ac8dace (diff) | |
| download | php-git-c342c9b96452c5660c32a6c1a34d9dab9066afef.tar.gz | |
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/opcache/ZendAccelerator.h | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -6,6 +6,9 @@ PHP NEWS . Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11). (Dmitry, Laruence) +- Opcache: + . Fixed bug # 64490 (struct flock undefined on FreeBSD). (Joe Watkins) + 21 Mar 2013, PHP 5.5.0 Beta 1 - Core: diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 3f10630ac8..ddcb7a16e4 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -93,7 +93,7 @@ #ifndef ZEND_WIN32 extern int lock_file; -# if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__)/* Darwin */) || defined(__OpenBSD__) || defined(__NetBSD__) +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (defined(__APPLE__) && defined(__MACH__)/* Darwin */) || defined(__OpenBSD__) || defined(__NetBSD__) # define FLOCK_STRUCTURE(name, type, whence, start, len) \ struct flock name = {start, len, -1, type, whence} # elif defined(__svr4__) |