com php-src: fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs: ext/opcache/ZendAccelerat or.h

From: Date: Mon, 25 Mar 2013 02:03:04 +0000
Subject: com php-src: fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs: ext/opcache/ZendAccelerat or.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-71721@lists.php.net to get a copy of this message
Commit: bd0b09c6103490437a30592d2adf1d3935f8e90c Author: Stanislav Malyshev <stas@php.net> Sun, 24 Mar 2013 19:03:04 -0700 Parents: c08e1d2be948d63f7a9309344a0ed4092ac8dace Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bd0b09c6103490437a30592d2adf1d3935f8e90c Log: fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs Bugs: https://bugs.php.net/64490 Changed paths: M ext/opcache/ZendAccelerator.h Diff: 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__)

« previous php.cvs (#71721) next »