|
@@ -4,6 +4,8 @@ Date: Tue, 9 Aug 2016 11:52:19 +0200
|
|
Subject: [PATCH] OPcache: flock mechanism is obviously linux so force it.
|
|
Subject: [PATCH] OPcache: flock mechanism is obviously linux so force it.
|
|
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
|
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
|
|
+[Bernd: update for 7.2.12]
|
|
---
|
|
---
|
|
ext/opcache/config.m4 | 34 ++--------------------------------
|
|
ext/opcache/config.m4 | 34 ++--------------------------------
|
|
1 file changed, 2 insertions(+), 32 deletions(-)
|
|
1 file changed, 2 insertions(+), 32 deletions(-)
|
|
@@ -21,12 +23,12 @@ index fbb9b21..ffddc8e 100644
|
|
-AC_TRY_RUN([
|
|
-AC_TRY_RUN([
|
|
- #include <fcntl.h>
|
|
- #include <fcntl.h>
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
|
-- int main() {
|
|
|
|
|
|
+- int main() {
|
|
- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
|
|
- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
|
|
- return 0;
|
|
- return 0;
|
|
- }
|
|
- }
|
|
- return 1;
|
|
- return 1;
|
|
-- }
|
|
|
|
|
|
+- }
|
|
-], [
|
|
-], [
|
|
- flock_type=linux
|
|
- flock_type=linux
|
|
- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
|
- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
|
@@ -37,15 +39,15 @@ index fbb9b21..ffddc8e 100644
|
|
-AC_TRY_RUN([
|
|
-AC_TRY_RUN([
|
|
- #include <fcntl.h>
|
|
- #include <fcntl.h>
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
|
-- int main() {
|
|
|
|
|
|
+- int main() {
|
|
- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
|
|
- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
|
|
- return 0;
|
|
- return 0;
|
|
- }
|
|
- }
|
|
- return 1;
|
|
- return 1;
|
|
-- }
|
|
|
|
|
|
+- }
|
|
-], [
|
|
-], [
|
|
- flock_type=bsd
|
|
- flock_type=bsd
|
|
-- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
|
|
|
|
|
|
+- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
|
|
- AC_MSG_RESULT("yes")
|
|
- AC_MSG_RESULT("yes")
|
|
-], AC_MSG_RESULT("no") )
|
|
-], AC_MSG_RESULT("no") )
|
|
+flock_type=linux
|
|
+flock_type=linux
|