WIP: php7 compatibility

yatsukhnenko · yatsukhnenko · commit 910dd952bfeb · 2016-09-28T18:30:17.000+03:00
Rename zend_rsrc_list_entry to zend_resource
diff --git a/cluster_library.h b/cluster_library.h
@@ -151,7 +151,7 @@ typedef enum CLUSTER_REDIR_TYPE {
 typedef int  (*mbulk_cb)(RedisSock*,zval*,long long, void* TSRMLS_DC);
 
 /* Specific destructor to free a cluster object */
-// void redis_destructor_redis_cluster(zend_rsrc_list_entry *rsrc TSRMLS_DC);
+// void redis_destructor_redis_cluster(zend_resource *rsrc TSRMLS_DC);
 
 /* A Redis Cluster master node */
 typedef struct redisClusterNode {
diff --git a/common.h b/common.h
@@ -136,6 +136,8 @@ inline_zend_get_parameters_array(int ht, int param_count, zval *argument_array T
     return ret;
 }
 
+typedef zend_rsrc_list_entry zend_resource;
+
 #else
 #include <ext/standard/php_smart_string.h>
 #endif
diff --git a/redis.c b/redis.c
@@ -425,7 +425,7 @@ static int send_discard_static(RedisSock *redis_sock TSRMLS_DC) {
 /**
  * redis_destructor_redis_sock
  */
-static void redis_destructor_redis_sock(zend_rsrc_list_entry * rsrc TSRMLS_DC)
+static void redis_destructor_redis_sock(zend_resource * rsrc TSRMLS_DC)
 {
     RedisSock *redis_sock = (RedisSock *) rsrc->ptr;
     redis_sock_disconnect(redis_sock TSRMLS_CC);
diff --git a/redis_array.c b/redis_array.c
@@ -117,7 +117,7 @@ static void redis_array_free(RedisArray *ra) {
 }
 
 int le_redis_array;
-void redis_destructor_redis_array(zend_rsrc_list_entry * rsrc TSRMLS_DC)
+void redis_destructor_redis_array(zend_resource * rsrc TSRMLS_DC)
 {
     RedisArray *ra = (RedisArray*)rsrc->ptr;
 
diff --git a/redis_array.h b/redis_array.h
@@ -8,7 +8,7 @@
 #endif
 #include "common.h"
 
-void redis_destructor_redis_array(zend_rsrc_list_entry * rsrc TSRMLS_DC);
+void redis_destructor_redis_array(zend_resource * rsrc TSRMLS_DC);
 
 PHP_METHOD(RedisArray, __construct);
 PHP_METHOD(RedisArray, __call);

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,8 @@ inline_zend_get_parameters_array(int ht, int param_count, zval *argument_array T`
`136`	`136`	`return ret;`
`137`	`137`	`}`
`138`	`138`
	`139`	`+typedef zend_rsrc_list_entry zend_resource;`
	`140`	`+`
`139`	`141`	`#else`
`140`	`142`	`#include <ext/standard/php_smart_string.h>`
`141`	`143`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ static int send_discard_static(RedisSock *redis_sock TSRMLS_DC) {`
`425`	`425`	`/**`
`426`	`426`	`* redis_destructor_redis_sock`
`427`	`427`	`*/`
`428`		`-static void redis_destructor_redis_sock(zend_rsrc_list_entry * rsrc TSRMLS_DC)`
	`428`	`+static void redis_destructor_redis_sock(zend_resource * rsrc TSRMLS_DC)`
`429`	`429`	`{`
`430`	`430`	`RedisSock redis_sock = (RedisSock ) rsrc->ptr;`
`431`	`431`	`redis_sock_disconnect(redis_sock TSRMLS_CC);`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ static void redis_array_free(RedisArray *ra) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`int le_redis_array;`
`120`		`-void redis_destructor_redis_array(zend_rsrc_list_entry * rsrc TSRMLS_DC)`
	`120`	`+void redis_destructor_redis_array(zend_resource * rsrc TSRMLS_DC)`
`121`	`121`	`{`
`122`	`122`	`RedisArray ra = (RedisArray)rsrc->ptr;`
`123`	`123`