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