0001-add-build-support-for-php-8.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. From 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438 Mon Sep 17 00:00:00 2001
  2. From: mmokhi <mokhi64@gmail.com>
  3. Date: Thu, 30 Jul 2020 11:25:33 +0200
  4. Subject: [PATCH] Add build support for PHP8.0 (#381)
  5. From upstream commit: 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438
  6. Signed-off-by: mmokhi <mokhi64@gmail.com>
  7. Signed-off-by: Adam Duskett <aduskett@gmail.com>
  8. ---
  9. amqp_envelope.h | 7 +++++++
  10. php7_support.h | 11 +++++++++++
  11. 2 files changed, 18 insertions(+)
  12. diff --git a/amqp_envelope.h b/amqp_envelope.h
  13. index e63a3a5..e315682 100644
  14. --- a/amqp_envelope.h
  15. +++ b/amqp_envelope.h
  16. @@ -20,6 +20,13 @@
  17. | - Jonathan Tansavatdi |
  18. +----------------------------------------------------------------------+
  19. */
  20. +
  21. +#if PHP_MAJOR_VERSION >= 7
  22. + #include "php7_support.h"
  23. +#else
  24. + #include "php5_support.h"
  25. +#endif
  26. +
  27. extern zend_class_entry *amqp_envelope_class_entry;
  28. void convert_amqp_envelope_to_zval(amqp_envelope_t *amqp_envelope, zval *envelope TSRMLS_DC);
  29. diff --git a/php7_support.h b/php7_support.h
  30. index 47ce983..c9e8f5b 100644
  31. --- a/php7_support.h
  32. +++ b/php7_support.h
  33. @@ -101,6 +101,17 @@ typedef zval PHP5to7_zend_resource_le_t;
  34. #define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL
  35. +/* Small change to let it build after a major internal change for php8.0
  36. + * More info:
  37. + * https://github.com/php/php-src/blob/php-8.0.0alpha3/UPGRADING.INTERNALS#L47
  38. + */
  39. +#if PHP_MAJOR_VERSION >= 8
  40. +# define TSRMLS_DC
  41. +# define TSRMLS_D
  42. +# define TSRMLS_CC
  43. +# define TSRMLS_C
  44. +# endif
  45. +
  46. #endif //PHP_AMQP_PHP7_SUPPORT_H
  47. /*