0003-fix-for-php-8.0.0beta2.patch 1.2 KB

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