diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2015-02-18 10:35:39 -0500 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2015-02-18 10:35:39 -0500 |
| commit | 9109e487493c7cf6b5fe732846bdd5efd20eb71b (patch) | |
| tree | c236fdf6366dd3f721e9d860bff86ccee195a22c /Zend/zend_API.h | |
| parent | 00b3e77ead0f0222959f29eb81819f2a566ab07d (diff) | |
| parent | e4294ef6e5710f6c7f5550bc0438a8186148dbe6 (diff) | |
| download | php-git-9109e487493c7cf6b5fe732846bdd5efd20eb71b.tar.gz | |
Merge in master
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 9e398b8696..adf7970de9 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -372,7 +372,7 @@ ZEND_API char *zend_get_type_by_const(int type); #define object_init(arg) _object_init((arg) ZEND_FILE_LINE_CC) #define object_init_ex(arg, ce) _object_init_ex((arg), (ce) ZEND_FILE_LINE_CC) #define object_and_properties_init(arg, ce, properties) _object_and_properties_init((arg), (ce), (properties) ZEND_FILE_LINE_CC) -ZEND_API int _array_init(zval *arg, uint size ZEND_FILE_LINE_DC); +ZEND_API int _array_init(zval *arg, uint32_t size ZEND_FILE_LINE_DC); ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC); ZEND_API int _object_init_ex(zval *arg, zend_class_entry *ce ZEND_FILE_LINE_DC); ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *ce, HashTable *properties ZEND_FILE_LINE_DC); |