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