fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

diff --git a/NEWS b/NEWS
index ae688987c7045a3441ec98ab2e5af07332a67e2b..92e9c2bfe84d670542ff2fa706906fc04349fef6 100644 (file)
--- 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 3f10630ac83e117a83e2bdd74b11bece63871023..ddcb7a16e45b737ae24e7d8a2972a89964e9f369 100644 (file)
--- 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__)