com php-src: fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs: NEWS ext/opcache/ZendAc celerator.h
| From: | Stanislav Malyshev | Date: | Mon, 25 Mar 2013 02:07:30 +0000 |
| Subject: | com php-src: fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs: NEWS ext/opcache/ZendAc celerator.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71720@lists.php.net to get a copy of this message | ||
Commit: c342c9b96452c5660c32a6c1a34d9dab9066afef
Author: Stanislav Malyshev <stas@php.net> Sun, 24 Mar 2013 19:03:04 -0700
Parents: c08e1d2be948d63f7a9309344a0ed4092ac8dace
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c342c9b96452c5660c32a6c1a34d9dab9066afef
Log:
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
Bugs:
https://bugs.php.net/64490
Changed paths:
M NEWS
M ext/opcache/ZendAccelerator.h
Diff:
diff --git a/NEWS b/NEWS
index ae68898..92e9c2b 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 3f10630..ddcb7a1 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__)