From: Stanislav Malyshev Date: Mon, 25 Mar 2013 02:03:04 +0000 (-0700) Subject: fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs X-Git-Tag: php-5.5.0beta2~15^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c342c9b96452c5660c32a6c1a34d9dab9066afef;p=php fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs --- diff --git a/NEWS b/NEWS index ae688987c7..92e9c2bfe8 100644 --- a/NEWS +++ b/NEWS @@ -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__)