More cleanup of PHP5 conditionals/commented code

phpredis · Mar 19, 2019 · 4601887 · 4601887
1 parent feb582f
commit 4601887
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/common.h b/common.h
@@ -275,17 +275,10 @@ typedef struct {
     int nb_active;
 } ConnectionPool;
 
-#if (PHP_MAJOR_VERSION < 7)
-typedef struct {
-    zend_object std;
-    RedisSock *sock;
-} redis_object;
-#else
 typedef struct {
     RedisSock *sock;
     zend_object std;
 } redis_object;
-#endif
 
 /** Argument info for any function expecting 0 args */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)

diff --git a/library.c b/library.c
@@ -2224,12 +2224,6 @@ redis_unserialize(RedisSock* redis_sock, const char *val, int val_len,
                                       (const unsigned char *)val + val_len,
                                        &var_hash);
 
-            //if (php_var_unserialize(z_ret, (const unsigned char**)&val,
-            //        (const unsigned char*)val + val_len, &var_hash)
-            //) {
-            //    ret = 1;
-            //}
-
             PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
             break;