Merge branch 'hotfix/tsrmls_cc-again'

michael-grunder · michael-grunder · commit 9acd3760ee71 · 2014-03-17T07:41:27.000-07:00
diff --git a/redis.c b/redis.c
@@ -6138,7 +6138,7 @@ PHP_METHOD(Redis, wait) {
  */
 PHPAPI int
 redis_build_pubsub_cmd(RedisSock *redis_sock, char **ret, PUBSUB_TYPE type,
-                       zval *arg TSRMLS_CC)
+                       zval *arg TSRMLS_DC)
 {
     HashTable *ht_chan;
     HashPosition ptr;    

Original file line number	Diff line number	Diff line change
`@@ -6138,7 +6138,7 @@ PHP_METHOD(Redis, wait) {`
`6138`	`6138`	`*/`
`6139`	`6139`	`PHPAPI int`
`6140`	`6140`	`redis_build_pubsub_cmd(RedisSock redis_sock, char *ret, PUBSUB_TYPE type,`
`6141`		`- zval *arg TSRMLS_CC)`
	`6141`	`+ zval *arg TSRMLS_DC)`
`6142`	`6142`	`{`
`6143`	`6143`	`HashTable *ht_chan;`
`6144`	`6144`	`HashPosition ptr;`