svn commit: r554223 - head/devel/pecl-zookeeper/files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Fri Nov 6 11:25:50 UTC 2020
Author: sunpoet
Date: Fri Nov 6 11:25:47 2020
New Revision: 554223
URL: https://svnweb.freebsd.org/changeset/ports/554223
Log:
Fix build with PHP 8.0
Added:
head/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.c (contents, props changed)
head/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h (contents, props changed)
head/devel/pecl-zookeeper/files/patch-php_zookeeper_config_class.c (contents, props changed)
head/devel/pecl-zookeeper/files/patch-php_zookeeper_config_class.h (contents, props changed)
head/devel/pecl-zookeeper/files/patch-php_zookeeper_exceptions.c (contents, props changed)
head/devel/pecl-zookeeper/files/patch-php_zookeeper_exceptions.h (contents, props changed)
head/devel/pecl-zookeeper/files/patch-php_zookeeper_session.c (contents, props changed)
Modified:
head/devel/pecl-zookeeper/files/patch-php_zookeeper.c
Modified: head/devel/pecl-zookeeper/files/patch-php_zookeeper.c
==============================================================================
--- head/devel/pecl-zookeeper/files/patch-php_zookeeper.c Fri Nov 6 11:25:40 2020 (r554222)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper.c Fri Nov 6 11:25:47 2020 (r554223)
@@ -1,6 +1,20 @@
--- php_zookeeper.c.orig 2019-12-11 01:31:04 UTC
+++ php_zookeeper.c
-@@ -772,7 +772,6 @@ static PHP_METHOD(Zookeeper, dispatch)
+@@ -51,6 +51,13 @@
+ #include "php_zookeeper_callback.h"
+ #include "php_zookeeper_log.h"
+
++#if PHP_MAJOR_VERSION >= 8
++#define TSRMLS_C
++#define TSRMLS_CC
++#define TSRMLS_DC
++#define TSRMLS_FETCH()
++#endif
++
+ /****************************************
+ Helper macros
+ ****************************************/
+@@ -772,7 +779,6 @@ static PHP_METHOD(Zookeeper, dispatch)
}
/* }}} */
@@ -8,7 +22,7 @@
/* {{{ Zookeeper::getConfig( .. )
*/
static PHP_METHOD(Zookeeper, getConfig)
-@@ -788,7 +787,6 @@ static PHP_METHOD(Zookeeper, getConfig)
+@@ -788,7 +794,6 @@ static PHP_METHOD(Zookeeper, getConfig)
RETURN_OBJ(php_zk_config_new_from_zk(php_zk_config_ce, i_obj));
}
/* }}} */
@@ -16,7 +30,7 @@
PHP_FUNCTION(zookeeper_dispatch)
{
-@@ -1250,10 +1248,8 @@ ZEND_END_ARG_INFO()
+@@ -1250,10 +1255,8 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_dispatch, 0)
ZEND_END_ARG_INFO()
@@ -27,7 +41,7 @@
/* }}} */
/* {{{ zookeeper_class_methods */
-@@ -1290,9 +1286,7 @@ static zend_function_entry zookeeper_class_methods[] =
+@@ -1290,9 +1293,7 @@ static zend_function_entry zookeeper_class_methods[] =
ZK_ME_STATIC(dispatch, arginfo_dispatch)
@@ -37,7 +51,7 @@
PHP_FE_END
};
-@@ -1381,10 +1375,8 @@ static void php_zk_register_constants(INIT_FUNC_ARGS)
+@@ -1381,10 +1382,8 @@ static void php_zk_register_constants(INIT_FUNC_ARGS)
ZK_CLASS_CONST_LONG2(OPERATIONTIMEOUT);
ZK_CLASS_CONST_LONG2(BADARGUMENTS);
ZK_CLASS_CONST_LONG2(INVALIDSTATE);
@@ -48,7 +62,7 @@
ZK_CLASS_CONST_LONG2(OK);
ZK_CLASS_CONST_LONG2(APIERROR);
-@@ -1463,9 +1455,7 @@ PHP_MINIT_FUNCTION(zookeeper)
+@@ -1463,9 +1462,7 @@ PHP_MINIT_FUNCTION(zookeeper)
php_zk_register_exceptions(TSRMLS_C);
@@ -58,7 +72,7 @@
#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 1
orig_interrupt_function = zend_interrupt_function;
-@@ -1537,7 +1527,11 @@ PHP_MINFO_FUNCTION(zookeeper)
+@@ -1537,7 +1534,11 @@ PHP_MINFO_FUNCTION(zookeeper)
php_info_print_table_header(2, "zookeeper support", "enabled");
php_info_print_table_row(2, "version", PHP_ZOOKEEPER_VERSION);
Added: head/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.c Fri Nov 6 11:25:47 2020 (r554223)
@@ -0,0 +1,13 @@
+--- php_zookeeper_callback.c.orig 2019-12-11 01:31:04 UTC
++++ php_zookeeper_callback.c
+@@ -19,6 +19,10 @@
+
+ #include "php_zookeeper_callback.h"
+
++#if PHP_MAJOR_VERSION >= 8
++#define TSRMLS_DC
++#endif
++
+ php_cb_data_t* php_cb_data_new(HashTable *ht, zend_fcall_info *fci, zend_fcall_info_cache *fcc, zend_bool oneshot TSRMLS_DC)
+ {
+ php_cb_data_t *cbd = ecalloc(1, sizeof(php_cb_data_t));
Added: head/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h Fri Nov 6 11:25:47 2020 (r554223)
@@ -0,0 +1,14 @@
+--- php_zookeeper_callback.h.orig 2019-12-11 01:31:04 UTC
++++ php_zookeeper_callback.h
+@@ -31,7 +31,11 @@ typedef struct _php_cb_data_t {
+ #endif
+ } php_cb_data_t;
+
++#if PHP_MAJOR_VERSION >= 8
++php_cb_data_t* php_cb_data_new(HashTable *ht, zend_fcall_info *fci, zend_fcall_info_cache *fcc, zend_bool oneshot);
++#else
+ php_cb_data_t* php_cb_data_new(HashTable *ht, zend_fcall_info *fci, zend_fcall_info_cache *fcc, zend_bool oneshot TSRMLS_DC);
++#endif
+ void php_cb_data_destroy(php_cb_data_t *cbd);
+ void php_cb_data_remove(php_cb_data_t *cb_data);
+
Added: head/devel/pecl-zookeeper/files/patch-php_zookeeper_config_class.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper_config_class.c Fri Nov 6 11:25:47 2020 (r554223)
@@ -0,0 +1,13 @@
+--- php_zookeeper_config_class.c.orig 2019-12-11 01:31:04 UTC
++++ php_zookeeper_config_class.c
+@@ -25,6 +25,10 @@
+ #include "php_zookeeper_config_class.h"
+ #include "php_zookeeper_stat.h"
+
++#if PHP_MAJOR_VERSION >= 8
++#define TSRMLS_CC
++#endif
++
+ typedef struct {
+ php_zk_t *php_zk;
+ zend_object zo;
Added: head/devel/pecl-zookeeper/files/patch-php_zookeeper_config_class.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper_config_class.h Fri Nov 6 11:25:47 2020 (r554223)
@@ -0,0 +1,15 @@
+--- php_zookeeper_config_class.h.orig 2019-12-11 01:31:04 UTC
++++ php_zookeeper_config_class.h
+@@ -19,7 +19,12 @@
+
+ extern zend_class_entry *php_zk_config_ce;
+
++#if PHP_MAJOR_VERSION >= 8
++void php_zk_config_register(void);
++zend_object* php_zk_config_new_from_zk(zend_class_entry *ce, php_zk_t *php_zk);
++#else
+ void php_zk_config_register(TSRMLS_D);
+ zend_object* php_zk_config_new_from_zk(zend_class_entry *ce, php_zk_t *php_zk TSRMLS_DC);
++#endif
+
+ #endif /* PHP_ZOOKEEPER_CONFIG_CLASS */
Added: head/devel/pecl-zookeeper/files/patch-php_zookeeper_exceptions.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper_exceptions.c Fri Nov 6 11:25:47 2020 (r554223)
@@ -0,0 +1,16 @@
+--- php_zookeeper_exceptions.c.orig 2019-12-11 01:31:04 UTC
++++ php_zookeeper_exceptions.c
+@@ -26,6 +26,13 @@
+
+ #include <Zend/zend_exceptions.h>
+
++#if PHP_MAJOR_VERSION >= 8
++#define TSRMLS_C
++#define TSRMLS_CC
++#define TSRMLS_D void
++#define TSRMLS_DC
++#endif
++
+ static zend_class_entry *zk_base_exception;
+ static zend_class_entry *zk_optimeout_exception;
+ static zend_class_entry *zk_connection_exception;
Added: head/devel/pecl-zookeeper/files/patch-php_zookeeper_exceptions.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper_exceptions.h Fri Nov 6 11:25:47 2020 (r554223)
@@ -0,0 +1,24 @@
+--- php_zookeeper_exceptions.h.orig 2019-12-11 01:31:04 UTC
++++ php_zookeeper_exceptions.h
+@@ -21,12 +21,21 @@
+ /**
+ * register exceptions
+ */
++#if PHP_MAJOR_VERSION >= 8
++void php_zk_register_exceptions(void);
++zend_class_entry * php_zk_get_exception_with_message(zend_class_entry *ce, char *message);
++#else
+ void php_zk_register_exceptions(TSRMLS_D);
+ zend_class_entry * php_zk_get_exception_with_message(zend_class_entry *ce, char *message TSRMLS_DC);
++#endif
+ /**
+ * throw exception according to status
+ */
++#if PHP_MAJOR_VERSION >= 8
++void php_zk_throw_exception(int zk_status);
++#else
+ void php_zk_throw_exception(int zk_status TSRMLS_DC);
++#endif
+
+ #define PHPZK_INITIALIZATION_FAILURE 5999
+ #define PHPZK_CONNECT_NOT_CALLED 5998
Added: head/devel/pecl-zookeeper/files/patch-php_zookeeper_session.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/pecl-zookeeper/files/patch-php_zookeeper_session.c Fri Nov 6 11:25:47 2020 (r554223)
@@ -0,0 +1,15 @@
+--- php_zookeeper_session.c.orig 2019-12-11 01:31:04 UTC
++++ php_zookeeper_session.c
+@@ -25,6 +25,12 @@
+ #include "php_zookeeper_private.h"
+ #include "php_zookeeper_session.h"
+
++#if PHP_MAJOR_VERSION >= 8
++#define TSRMLS_D void
++#define TSRMLS_DC
++#define TSRMLS_CC
++#endif
++
+ #ifdef HAVE_ZOOKEEPER_SESSION
+
+ #define ZK_SESS_DATA php_zookeeper_session *session = PS_GET_MOD_DATA();
More information about the svn-ports-head
mailing list