More fixes for PHP 5.4

nicolasff · nicolasff · commit 32e8d4143c05 · 2012-03-12T07:05:30.000Z
diff --git a/redis_array.c b/redis_array.c
@@ -251,7 +251,11 @@ PHP_METHOD(RedisArray, __construct)
 
 	if(ra) {
 		ra->auto_rehash = b_autorehash;
+#if PHP_VERSION_ID >= 50400
+		id = zend_list_insert(ra, le_redis_array TSRMLS_CC);
+#else
 		id = zend_list_insert(ra, le_redis_array);
+#endif
 		add_property_resource(getThis(), "socket", id);
 	}
 }
diff --git a/redis_array_impl.c b/redis_array_impl.c
@@ -73,7 +73,11 @@ ra_load_hosts(RedisArray *ra, HashTable *hosts TSRMLS_DC)
 		redis_sock_server_open(redis_sock, 1 TSRMLS_CC);
 
 		/* attach */
+#if PHP_VERSION_ID >= 50400
+		id = zend_list_insert(redis_sock, le_redis_sock TSRMLS_CC);
+#else
 		id = zend_list_insert(redis_sock, le_redis_sock);
+#endif
 		add_property_resource(ra->redis[i], "socket", id);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,11 @@ PHP_METHOD(RedisArray, __construct)`
`251`	`251`
`252`	`252`	`if(ra) {`
`253`	`253`	`ra->auto_rehash = b_autorehash;`
	`254`	`+#if PHP_VERSION_ID >= 50400`
	`255`	`+ id = zend_list_insert(ra, le_redis_array TSRMLS_CC);`
	`256`	`+#else`
`254`	`257`	`id = zend_list_insert(ra, le_redis_array);`
	`258`	`+#endif`
`255`	`259`	`add_property_resource(getThis(), "socket", id);`
`256`	`260`	`}`
`257`	`261`	`}`