diff options
| author | Pavlo Yatsukhnenko <yatsukhnenko@gmail.com> | 2016-11-10 10:37:02 +0300 |
|---|---|---|
| committer | Pavlo Yatsukhnenko <yatsukhnenko@gmail.com> | 2016-11-10 22:39:34 +0300 |
| commit | 8a4eeecaf3220ed941c0489d439c52754e0da00b (patch) | |
| tree | f9a2ab59b2585027d42ea928ebfcec4e0d1a5ce1 /redis_cluster.h | |
| parent | 8f64ab3303fb2da9b42a5c38a884862aef0c794c (diff) | |
WIP: php7 compatibility
Diffstat (limited to 'redis_cluster.h')
| -rw-r--r-- | redis_cluster.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/redis_cluster.h b/redis_cluster.h index 1ff465b2..34689429 100644 --- a/redis_cluster.h +++ b/redis_cluster.h @@ -15,7 +15,7 @@ ((redisCluster*)zend_object_store_get_object(getThis() TSRMLS_CC)) #else #define GET_CONTEXT() \ - ((redisCluster *)((char *)getThis() - XtOffsetOf(redisCluster, std))) + ((redisCluster *)((char *)Z_OBJ_P(getThis()) - XtOffsetOf(redisCluster, std))) #endif /* Command building/processing is identical for every command */ @@ -106,15 +106,18 @@ /* For the creation of RedisCluster specific exceptions */ PHP_REDIS_API zend_class_entry *rediscluster_get_exception_base(int root TSRMLS_DC); -/* Create cluster context */ #if (PHP_MAJOR_VERSION < 7) +/* Create cluster context */ zend_object_value create_cluster_context(zend_class_entry *class_type TSRMLS_DC); +/* Free cluster context struct */ +void free_cluster_context(void *object TSRMLS_DC); #else +/* Create cluster context */ zend_object *create_cluster_context(zend_class_entry *class_type TSRMLS_DC); +/* Free cluster context struct */ +void free_cluster_context(zend_object *object); #endif -/* Free cluster context struct */ -void free_cluster_context(void *object TSRMLS_DC); /* Inittialize our class with PHP */ void init_rediscluster(TSRMLS_D); |