summaryrefslogtreecommitdiffstats
path: root/20869861c8a706efec921b0ae18c78a3c12cd1f0.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-06-21 09:41:36 +0200
committerRemi Collet <remi@remirepo.net>2017-06-21 09:41:36 +0200
commit7bbf472395d60780920da7565138e67d6890e5ce (patch)
treebf0908df21db23c9e0935332f6cfd84c0f31e5e7 /20869861c8a706efec921b0ae18c78a3c12cd1f0.patch
parentbae2f9526039cc2addbce0d3329885a7a22c5c90 (diff)
upstream patch for 7.2.0alpha2
Diffstat (limited to '20869861c8a706efec921b0ae18c78a3c12cd1f0.patch')
-rw-r--r--20869861c8a706efec921b0ae18c78a3c12cd1f0.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/20869861c8a706efec921b0ae18c78a3c12cd1f0.patch b/20869861c8a706efec921b0ae18c78a3c12cd1f0.patch
new file mode 100644
index 0000000..95ef807
--- /dev/null
+++ b/20869861c8a706efec921b0ae18c78a3c12cd1f0.patch
@@ -0,0 +1,31 @@
+From 20869861c8a706efec921b0ae18c78a3c12cd1f0 Mon Sep 17 00:00:00 2001
+From: Bob Weinand <bobwei9@hotmail.com>
+Date: Fri, 16 Jun 2017 16:30:36 +0200
+Subject: [PATCH] Fix 7.2 build
+
+---
+ php_uv.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/php_uv.c b/php_uv.c
+index 6a41b49..8558bed 100644
+--- a/php_uv.c
++++ b/php_uv.c
+@@ -52,10 +52,16 @@ ZEND_DECLARE_MODULE_GLOBALS(uv);
+ #define uv_zend_wrong_parameter_class_error(...) zend_wrong_parameter_class_error(__VA_ARGS__)
+ #endif
+
++#if PHP_VERSION_ID < 70200
++ #define UV_PARAM_PROLOGUE Z_PARAM_PROLOGUE(0)
++#else
++ #define UV_PARAM_PROLOGUE Z_PARAM_PROLOGUE(0, 0)
++#endif
++
+ #define UV_PARAM_OBJ_EX(dest, type, check_null, ce, ...) \
+ { \
+ zval *zv; \
+- Z_PARAM_PROLOGUE(0) \
++ UV_PARAM_PROLOGUE \
+ if (UNEXPECTED(!uv_parse_arg_object(_arg, &zv, check_null, ce, ##__VA_ARGS__, NULL))) { \
+ if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \
+ zend_string *names = php_uv_concat_ce_names(ce, ##__VA_ARGS__, NULL); \