1*4882a593SmuzhiyunFrom f0993f1fe973c4d359323ad1897ed7aa74f7e015 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Remi Collet <remi@remirepo.net> 3*4882a593SmuzhiyunDate: Mon, 24 Aug 2020 15:55:54 +0200 4*4882a593SmuzhiyunSubject: [PATCH] fix for PHP 8.0.0beta2 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Remi Collet <remi@remirepo.net> 7*4882a593SmuzhiyunSigned-off-by: Adam Duskett <aduskett@gmail.com> 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun zmq.c | 2 ++ 10*4882a593Smuzhiyun zmq_device.c | 2 ++ 11*4882a593Smuzhiyun 2 files changed, 4 insertions(+) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/zmq.c b/zmq.c 14*4882a593Smuzhiyunindex 89902f9..bd2401d 100644 15*4882a593Smuzhiyun--- a/zmq.c 16*4882a593Smuzhiyun+++ b/zmq.c 17*4882a593Smuzhiyun@@ -621,7 +621,9 @@ zend_bool php_zmq_connect_callback(zval *socket, zend_fcall_info *fci, zend_fcal 18*4882a593Smuzhiyun fci->params = params; 19*4882a593Smuzhiyun fci->param_count = 2; 20*4882a593Smuzhiyun fci->retval = &retval; 21*4882a593Smuzhiyun+#if PHP_VERSION_ID < 80000 22*4882a593Smuzhiyun fci->no_separation = 1; 23*4882a593Smuzhiyun+#endif 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun if (zend_call_function(fci, fci_cache) == FAILURE) { 26*4882a593Smuzhiyun if (!EG(exception)) { 27*4882a593Smuzhiyundiff --git a/zmq_device.c b/zmq_device.c 28*4882a593Smuzhiyunindex 534f966..1c6aa3e 100644 29*4882a593Smuzhiyun--- a/zmq_device.c 30*4882a593Smuzhiyun+++ b/zmq_device.c 31*4882a593Smuzhiyun@@ -53,7 +53,9 @@ zend_bool s_invoke_device_cb (php_zmq_device_cb_t *cb, uint64_t current_ts) 32*4882a593Smuzhiyun cb->fci.param_count = 1; 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun /* Call the cb */ 35*4882a593Smuzhiyun+#if PHP_VERSION_ID < 80000 36*4882a593Smuzhiyun cb->fci.no_separation = 1; 37*4882a593Smuzhiyun+#endif 38*4882a593Smuzhiyun cb->fci.retval = &fc_retval; 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun if (zend_call_function(&(cb->fci), &(cb->fci_cache)) == FAILURE) { 41