diff options
| author | michael-grunder <michael.grunder@gmail.com> | 2014-12-16 22:22:14 +0300 |
|---|---|---|
| committer | michael-grunder <michael.grunder@gmail.com> | 2014-12-16 22:22:14 +0300 |
| commit | 243cca9cdea21db2806295af39c20764c51d6164 (patch) | |
| tree | 76473fd88056099b6b4bc1273f0743f8425d6109 /php_redis.h | |
| parent | bd7c0b899fda8f219523bd5ed3812e865795be65 (diff) | |
| parent | b635f628190fc4aa1ccebd7a1dd8aa4f88815721 (diff) | |
Merge branch 'multibulk-serialize' into develop
Conflicts:
redis.c
References #538
Diffstat (limited to 'php_redis.h')
| -rw-r--r-- | php_redis.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/php_redis.h b/php_redis.h index 596b71c2..48108573 100644 --- a/php_redis.h +++ b/php_redis.h @@ -243,7 +243,6 @@ PHP_REDIS_API void generic_empty_long_cmd(INTERNAL_FUNCTION_PARAMETERS, char *cm PHP_REDIS_API void generic_subscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sub_cmd); PHP_REDIS_API void generic_unsubscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *unsub_cmd); -PHP_REDIS_API void array_zip_values_and_scores(RedisSock *redis_sock, zval *z_tab, int use_atof TSRMLS_DC); PHP_REDIS_API int redis_response_enqueued(RedisSock *redis_sock TSRMLS_DC); PHP_REDIS_API int get_flag(zval *object TSRMLS_DC); |