Fixed ZTS macros.

nicolasff · nicolasff · commit 6f6c4ff4180e · 2011-04-04T12:28:15.000+02:00
diff --git a/library.c b/library.c
@@ -1091,7 +1091,7 @@ PHPAPI void redis_free_socket(RedisSock *redis_sock)
 }
 
 PHPAPI int
-redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_CC) {
+redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_DC) {
 #if ZEND_MODULE_API_NO >= 20100000
 	php_serialize_data_t ht;
 #else
@@ -1163,7 +1163,7 @@ redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_
 }
 
 PHPAPI int
-redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **return_value TSRMLS_CC) {
+redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **return_value TSRMLS_DC) {
 
 	php_unserialize_data_t var_hash;
 	int ret;
@@ -1203,7 +1203,7 @@ redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **re
 }
 
 PHPAPI int
-redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len TSRMLS_CC) {
+redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len TSRMLS_DC) {
 	if(redis_sock->prefix == NULL || redis_sock->prefix_len == 0) {
 		return 0;
 	}
diff --git a/library.h b/library.h
@@ -33,9 +33,9 @@ PHPAPI int redis_check_eof(RedisSock *redis_sock TSRMLS_DC);
 PHPAPI void redis_free_socket(RedisSock *redis_sock);
 
 PHPAPI int
-redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_CC);
+redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_DC);
 PHPAPI int
-redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len TSRMLS_CC);
+redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len TSRMLS_DC);
 
 PHPAPI int
-redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **return_value TSRMLS_CC);
+redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **return_value TSRMLS_DC);
diff --git a/redis.c b/redis.c

Original file line number	Diff line number	Diff line change
`@@ -1091,7 +1091,7 @@ PHPAPI void redis_free_socket(RedisSock *redis_sock)`
`1091`	`1091`	`}`
`1092`	`1092`
`1093`	`1093`	`PHPAPI int`
`1094`		`-redis_serialize(RedisSock redis_sock, zval z, char *val, int val_len TSRMLS_CC) {`
	`1094`	`+redis_serialize(RedisSock redis_sock, zval z, char *val, int val_len TSRMLS_DC) {`
`1095`	`1095`	`#if ZEND_MODULE_API_NO >= 20100000`
`1096`	`1096`	`php_serialize_data_t ht;`
`1097`	`1097`	`#else`
`@@ -1163,7 +1163,7 @@ redis_serialize(RedisSock redis_sock, zval z, char *val, int val_len TSRMLS_`
`1163`	`1163`	`}`
`1164`	`1164`
`1165`	`1165`	`PHPAPI int`
`1166`		`-redis_unserialize(RedisSock redis_sock, const char val, int val_len, zval **return_value TSRMLS_CC) {`
	`1166`	`+redis_unserialize(RedisSock redis_sock, const char val, int val_len, zval **return_value TSRMLS_DC) {`
`1167`	`1167`
`1168`	`1168`	`php_unserialize_data_t var_hash;`
`1169`	`1169`	`int ret;`
`@@ -1203,7 +1203,7 @@ redis_unserialize(RedisSock redis_sock, const char val, int val_len, zval **re`
`1203`	`1203`	`}`
`1204`	`1204`
`1205`	`1205`	`PHPAPI int`
`1206`		`-redis_key_prefix(RedisSock redis_sock, char key, int key_len TSRMLS_CC) {`
	`1206`	`+redis_key_prefix(RedisSock redis_sock, char key, int key_len TSRMLS_DC) {`
`1207`	`1207`	`if(redis_sock->prefix == NULL \|\| redis_sock->prefix_len == 0) {`
`1208`	`1208`	`return 0;`
`1209`	`1209`	`}`