Permalink
Browse files

fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

  • Loading branch information...
1 parent c08e1d2 commit c342c9b96452c5660c32a6c1a34d9dab9066afef @smalyshev smalyshev committed Mar 25, 2013
Showing with 4 additions and 1 deletion.
  1. +3 −0 NEWS
  2. +1 −1 ext/opcache/ZendAccelerator.h
View
3 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:
@@ -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__)

0 comments on commit c342c9b

Please sign in to comment.