diff options
| author | Anatol Belski <ab@php.net> | 2014-10-22 09:47:07 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-22 17:56:22 +0200 |
| commit | 5e24ae321dbc503ce0e69ec801c00b03cf62f03f (patch) | |
| tree | b2c742508a9ee68b3487d293c6e46c726a9a0137 /Zend | |
| parent | 80163b4a2b9ae8cef4c01f719aed795b9eb0a966 (diff) | |
| download | php-git-5e24ae321dbc503ce0e69ec801c00b03cf62f03f.tar.gz | |
all the key_len use uint, fix the warning when using strlen on 64 bit
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_API.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index b2faf7e253..64d67fb263 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -443,15 +443,15 @@ ZEND_API int add_property_string_ex(zval *arg, const char *key, uint key_len, co ZEND_API int add_property_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, size_t length TSRMLS_DC); ZEND_API int add_property_zval_ex(zval *arg, const char *key, uint key_len, zval *value TSRMLS_DC); -#define add_property_long(__arg, __key, __n) add_property_long_ex(__arg, __key, strlen(__key), __n TSRMLS_CC) -#define add_property_null(__arg, __key) add_property_null_ex(__arg, __key, strlen(__key) TSRMLS_CC) -#define add_property_bool(__arg, __key, __b) add_property_bool_ex(__arg, __key, strlen(__key), __b TSRMLS_CC) -#define add_property_resource(__arg, __key, __r) add_property_resource_ex(__arg, __key, strlen(__key), __r TSRMLS_CC) -#define add_property_double(__arg, __key, __d) add_property_double_ex(__arg, __key, strlen(__key), __d TSRMLS_CC) -#define add_property_str(__arg, __key, __str) add_property_str_ex(__arg, __key, strlen(__key), __str TSRMLS_CC) -#define add_property_string(__arg, __key, __str) add_property_string_ex(__arg, __key, strlen(__key), __str TSRMLS_CC) -#define add_property_stringl(__arg, __key, __str, __length) add_property_stringl_ex(__arg, __key, strlen(__key), __str, __length TSRMLS_CC) -#define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, strlen(__key), __value TSRMLS_CC) +#define add_property_long(__arg, __key, __n) add_property_long_ex(__arg, __key, (uint)strlen(__key), __n TSRMLS_CC) +#define add_property_null(__arg, __key) add_property_null_ex(__arg, __key, (uint)strlen(__key) TSRMLS_CC) +#define add_property_bool(__arg, __key, __b) add_property_bool_ex(__arg, __key, (uint)strlen(__key), __b TSRMLS_CC) +#define add_property_resource(__arg, __key, __r) add_property_resource_ex(__arg, __key, (uint)strlen(__key), __r TSRMLS_CC) +#define add_property_double(__arg, __key, __d) add_property_double_ex(__arg, __key, (uint)strlen(__key), __d TSRMLS_CC) +#define add_property_str(__arg, __key, __str) add_property_str_ex(__arg, __key, (uint)strlen(__key), __str TSRMLS_CC) +#define add_property_string(__arg, __key, __str) add_property_string_ex(__arg, __key, (uint)strlen(__key), __str TSRMLS_CC) +#define add_property_stringl(__arg, __key, __str, __length) add_property_stringl_ex(__arg, __key, (uint)strlen(__key), __str, __length TSRMLS_CC) +#define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, (uint)strlen(__key), __value TSRMLS_CC) ZEND_API int call_user_function(HashTable *function_table, zval *object, zval *function_name, zval *retval_ptr, uint32_t param_count, zval params[] TSRMLS_DC); |