com php-src: Fixed incorrect type usage: Zend/zend_constants .c Zend/zend_constants.h

Commit: e58682a2c4aebb377a90fbca8d87c207a8f64362 Author: Dmitry Stogov <dmitry@zend.com> Wed, 28 Oct 2015 10:26:47 +0300 Parents: 524a468d5f54f89433dbf579d2b91a504f0b75d2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e58682a2c4aebb377a90fbca8d87c207a8f64362 Log: Fixed incorrect type usage Changed paths: M Zend/zend_constants.c M Zend/zend_constants.h Diff: diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 8d1be74..159379d 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -294,7 +294,7 @@ ZEND_API zval *zend_get_constant(zend_string *name) return c ? &c->value : NULL; } -ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, zend_ulong flags) +ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, uint32_t flags) { zend_constant *c; const char *colon; @@ -427,7 +427,7 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, } } -zend_constant *zend_quick_get_constant(const zval *key, zend_ulong flags) +zend_constant *zend_quick_get_constant(const zval *key, uint32_t flags) { zend_constant *c; diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h index 9ccf53e..2f8b728 100644 --- a/Zend/zend_constants.h +++ b/Zend/zend_constants.h @@ -67,7 +67,7 @@ void zend_register_standard_constants(void); void clean_non_persistent_constants(void); ZEND_API zval *zend_get_constant(zend_string *name); ZEND_API zval *zend_get_constant_str(const char *name, size_t name_len); -ZEND_API zval *zend_get_constant_ex(zend_string *name, zend_class_entry *scope, zend_ulong flags); +ZEND_API zval *zend_get_constant_ex(zend_string *name, zend_class_entry *scope, uint32_t flags); ZEND_API void zend_register_bool_constant(const char *name, size_t name_len, zend_bool bval, int flags, int module_number); ZEND_API void zend_register_null_constant(const char *name, size_t name_len, int flags, int module_number); ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zend_long lval, int flags, int module_number); @@ -76,7 +76,7 @@ ZEND_API void zend_register_string_constant(const char *name, size_t name_len, c ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len, char *strval, size_t strlen, int flags, int module_number); ZEND_API int zend_register_constant(zend_constant *c); void zend_copy_constants(HashTable *target, HashTable *sourc); -zend_constant *zend_quick_get_constant(const zval *key, zend_ulong flags); +zend_constant *zend_quick_get_constant(const zval *key, uint32_t flags); END_EXTERN_C() #define ZEND_CONSTANT_DTOR free_zend_constant