cleanup code for unsupported versions

remicollet · michael-grunder · commit 37cebdd70b06 · 2024-08-05T08:58:58.000-07:00
diff --git a/backoff.c b/backoff.c
@@ -6,12 +6,6 @@
 #include <ext/random/php_random.h>
 #endif
 
-#if PHP_VERSION_ID < 70100
-static zend_long php_mt_rand_range(zend_long min, zend_long max) {
-	return min + php_rand() % (max - min + 1)
-}
-#endif
-
 #include "backoff.h"
 
 static zend_ulong random_range(zend_ulong min, zend_ulong max) {
diff --git a/library.c b/library.c
@@ -100,15 +100,7 @@ static int redis_mbulk_reply_zipped_raw_variant(RedisSock *redis_sock, zval *zre
 
 /* Register a persistent resource in a a way that works for every PHP 7 version. */
 void redis_register_persistent_resource(zend_string *id, void *ptr, int le_id) {
-#if PHP_VERSION_ID < 70300
-    zend_resource res;
-    res.type = le_id;
-    res.ptr = ptr;
-
-    zend_hash_str_update_mem(&EG(persistent_list), ZSTR_VAL(id), ZSTR_LEN(id), &res, sizeof(res));
-#else
     zend_register_persistent_resource(ZSTR_VAL(id), ZSTR_LEN(id), ptr, le_id);
-#endif
 }
 
 static ConnectionPool *
diff --git a/redis_session.c b/redis_session.c
@@ -413,11 +413,7 @@ static void lock_release(RedisSock *redis_sock, redis_session_lock_status *lock_
     }
 }
 
-#if PHP_VERSION_ID < 70300
-#define REDIS_URL_STR(umem) umem
-#else
 #define REDIS_URL_STR(umem) ZSTR_VAL(umem)
-#endif
 
 /* {{{ PS_OPEN_FUNC
  */

Original file line number	Diff line number	Diff line change
`@@ -413,11 +413,7 @@ static void lock_release(RedisSock redis_sock, redis_session_lock_status lock_`
`413`	`413`	`}`
`414`	`414`	`}`
`415`	`415`
`416`		`-#if PHP_VERSION_ID < 70300`
`417`		`-#define REDIS_URL_STR(umem) umem`
`418`		`-#else`
`419`	`416`	`#define REDIS_URL_STR(umem) ZSTR_VAL(umem)`
`420`		`-#endif`
`421`	`417`
`422`	`418`	`/* {{{ PS_OPEN_FUNC`
`423`	`419`	`*/`