diff options
| author | Remi Collet <remi@remirepo.net> | 2021-09-01 08:47:58 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-09-01 08:47:58 +0200 |
| commit | 6be4de9ca98db0fd222b9fc437debd4ccd1b3ee5 (patch) | |
| tree | 31e53986bde84068ebbfd25f4325fb0874ad2c68 /96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch | |
| parent | 1564682b107d0a280ecf4b3265a3f26458166ae1 (diff) | |
update to 1.11.0beta
drop patched merged upstream
Diffstat (limited to '96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch')
| -rw-r--r-- | 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch b/96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch deleted file mode 100644 index 6070e36..0000000 --- a/96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438 Mon Sep 17 00:00:00 2001 -From: mmokhi <mokhi64@gmail.com> -Date: Thu, 30 Jul 2020 11:25:33 +0200 -Subject: [PATCH] Add build support for PHP8.0 (#381) - ---- - amqp_envelope.h | 7 +++++++ - php7_support.h | 11 +++++++++++ - 2 files changed, 18 insertions(+) - -diff --git a/amqp_envelope.h b/amqp_envelope.h -index e63a3a5..e315682 100644 ---- a/amqp_envelope.h -+++ b/amqp_envelope.h -@@ -20,6 +20,13 @@ - | - Jonathan Tansavatdi | - +----------------------------------------------------------------------+ - */ -+ -+#if PHP_MAJOR_VERSION >= 7 -+ #include "php7_support.h" -+#else -+ #include "php5_support.h" -+#endif -+ - extern zend_class_entry *amqp_envelope_class_entry; - - void convert_amqp_envelope_to_zval(amqp_envelope_t *amqp_envelope, zval *envelope TSRMLS_DC); -diff --git a/php7_support.h b/php7_support.h -index 47ce983..c9e8f5b 100644 ---- a/php7_support.h -+++ b/php7_support.h -@@ -101,6 +101,17 @@ typedef zval PHP5to7_zend_resource_le_t; - - #define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL - -+/* Small change to let it build after a major internal change for php8.0 -+ * More info: -+ * https://github.com/php/php-src/blob/php-8.0.0alpha3/UPGRADING.INTERNALS#L47 -+ */ -+#if PHP_MAJOR_VERSION >= 8 -+# define TSRMLS_DC -+# define TSRMLS_D -+# define TSRMLS_CC -+# define TSRMLS_C -+# endif -+ - #endif //PHP_AMQP_PHP7_SUPPORT_H - - /* |