Merge branch 'hotfix/tsrmls_cc'

Author: michael-grunder

redis.c

@@ -398,7 +398,7 @@ PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC, int no_thr
  * redis_sock_get_direct
  * Returns our attached RedisSock pointer if we're connected
  */
-PHPAPI RedisSock *redis_sock_get_connected(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC) {
+PHPAPI RedisSock *redis_sock_get_connected(INTERNAL_FUNCTION_PARAMETERS) {
     zval *object;
     RedisSock *redis_sock;
 
@@ -6348,7 +6348,7 @@ PHP_METHOD(Redis, time) {
 PHP_METHOD(Redis, isConnected) {
     RedisSock *redis_sock;
 
-    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
+    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
         RETURN_TRUE;
     } else {
         RETURN_FALSE;
@@ -6361,7 +6361,7 @@ PHP_METHOD(Redis, isConnected) {
 PHP_METHOD(Redis, getHost) {
     RedisSock *redis_sock;
 
-    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
+    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
         RETURN_STRING(redis_sock->host, 1);
     } else {
         RETURN_FALSE;
@@ -6374,7 +6374,7 @@ PHP_METHOD(Redis, getHost) {
 PHP_METHOD(Redis, getPort) {
     RedisSock *redis_sock;
 
-    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
+    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
         // Return our port
         RETURN_LONG(redis_sock->port);
     } else {
@@ -6388,7 +6388,7 @@ PHP_METHOD(Redis, getPort) {
 PHP_METHOD(Redis, getDBNum) {
     RedisSock *redis_sock;
 
-    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
+    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
         // Return our db number
         RETURN_LONG(redis_sock->dbNumber);
     } else {
@@ -6402,7 +6402,7 @@ PHP_METHOD(Redis, getDBNum) {
 PHP_METHOD(Redis, getTimeout) {
     RedisSock *redis_sock;
 
-    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
+    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
         RETURN_DOUBLE(redis_sock->timeout);
     } else {
         RETURN_FALSE;
@@ -6415,7 +6415,7 @@ PHP_METHOD(Redis, getTimeout) {
 PHP_METHOD(Redis, getReadTimeout) {
     RedisSock *redis_sock;
 
-    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
+    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
         RETURN_DOUBLE(redis_sock->read_timeout);
     } else {
         RETURN_FALSE;
@@ -6428,7 +6428,7 @@ PHP_METHOD(Redis, getReadTimeout) {
 PHP_METHOD(Redis, getPersistentID) {
     RedisSock *redis_sock;
 
-    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
+    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
         if(redis_sock->persistent_id != NULL) {
             RETURN_STRING(redis_sock->persistent_id, 1);
         } else {
@@ -6445,7 +6445,7 @@ PHP_METHOD(Redis, getPersistentID) {
 PHP_METHOD(Redis, getAuth) {
     RedisSock *redis_sock;
 
-    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
+    if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
         if(redis_sock->auth != NULL) {
             RETURN_STRING(redis_sock->auth, 1);
         } else {