diff options
| author | Pavlo Yatsukhnenko <yatsukhnenko@gmail.com> | 2017-10-05 15:27:18 +0300 |
|---|---|---|
| committer | Pavlo Yatsukhnenko <yatsukhnenko@gmail.com> | 2017-10-05 15:27:18 +0300 |
| commit | 0115666e59f1348d983872bd5488f52018a472c1 (patch) | |
| tree | 5b5a8d0a1ef41685705c7652f98143efcdeb16a2 /redis_array_impl.c | |
| parent | 6d63d12066db759c3435c16253c93a99b11d5597 (diff) | |
Add PHPREDIS_GET_OBJECT macros
Diffstat (limited to 'redis_array_impl.c')
| -rw-r--r-- | redis_array_impl.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/redis_array_impl.c b/redis_array_impl.c index ebbaef5b..1a5aa7ba 100644 --- a/redis_array_impl.c +++ b/redis_array_impl.c @@ -69,11 +69,7 @@ ra_load_hosts(RedisArray *ra, HashTable *hosts, long retry_interval, zend_bool b call_user_function(&redis_ce->function_table, &ra->redis[i], &z_cons, &z_ret, 0, NULL); zval_dtor(&z_ret); -#if (PHP_MAJOR_VERSION < 7) - redis = (redis_object *)zend_objects_get_address(&ra->redis[i] TSRMLS_CC); -#else - redis = (redis_object *)((char *)Z_OBJ_P(&ra->redis[i]) - XtOffsetOf(redis_object, std)); -#endif + redis = PHPREDIS_GET_OBJECT(redis_object, &ra->redis[i]); /* create socket */ redis->sock = redis_sock_create(host, host_len, port, ra->connect_timeout, ra->read_timeout, ra->pconnect, NULL, retry_interval, b_lazy_connect); |