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