diff options
| -rw-r--r-- | common.h | 1 | ||||
| -rw-r--r-- | redis_array.c | 11 |
2 files changed, 4 insertions, 8 deletions
@@ -12,7 +12,6 @@ #include <zend_smart_str.h> #include <ext/standard/php_smart_string.h> -#define PHPREDIS_ZVAL_IS_STRICT_FALSE(z) (Z_TYPE_P(z) == IS_FALSE) #define PHPREDIS_GET_OBJECT(class_entry, o) (class_entry *)((char *)o - XtOffsetOf(class_entry, std)) #define PHPREDIS_ZVAL_GET_OBJECT(class_entry, z) PHPREDIS_GET_OBJECT(class_entry, Z_OBJ_P(z)) diff --git a/redis_array.c b/redis_array.c index aa0fd718..4c0479a4 100644 --- a/redis_array.c +++ b/redis_array.c @@ -19,19 +19,16 @@ #include "config.h" #endif -#include "common.h" -#include "ext/standard/info.h" -#include "php_ini.h" -#include "php_redis.h" -#include <zend_exceptions.h> - #include "library.h" #include "redis_array.h" #include "redis_array_impl.h" +#include <ext/standard/info.h> +#include <zend_exceptions.h> + /* Simple macro to detect failure in a RedisArray call */ #define RA_CALL_FAILED(rv, cmd) ( \ - PHPREDIS_ZVAL_IS_STRICT_FALSE(rv) || \ + (Z_TYPE_P(rv) == IS_FALSE) || \ (Z_TYPE_P(rv) == IS_ARRAY && zend_hash_num_elements(Z_ARRVAL_P(rv)) == 0) || \ (Z_TYPE_P(rv) == IS_LONG && Z_LVAL_P(rv) == 0 && !strcasecmp(cmd, "TYPE")) \ ) |