diff options
| author | Johannes Schlüter <johannes@php.net> | 2014-10-04 20:00:10 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2014-10-04 20:00:10 +0200 |
| commit | 61d29990b428458896c299297d5e48cb30fb7ae9 (patch) | |
| tree | 1da20349172d8b0285a8c9dfb8e51267250ab7a4 /ext/reflection/php_reflection.c | |
| parent | 0e5f475f5e3e049c428fe2857f910ab36201c071 (diff) | |
| parent | 136dd53ac29fabce18127b8ecb95b606f141d42d (diff) | |
| download | php-git-61d29990b428458896c299297d5e48cb30fb7ae9.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index bdcea373a5..60097538d6 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -5705,7 +5705,7 @@ static const zend_function_entry reflection_exception_functions[] = { PHP_FE_END }; -ZEND_BEGIN_ARG_INFO(arginfo_reflection__void, 0) +ZEND_BEGIN_ARG_INF(arginfo_reflection__void, 0) ZEND_END_ARG_INFO() @@ -6098,7 +6098,7 @@ ZEND_END_ARG_INFO() static const zend_function_entry reflection_zend_extension_functions[] = { ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) ZEND_ME(reflection_zend_extension, export, arginfo_reflection_extension_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC) - ZEND_ME(reflection_zend_extension, __construct, arginfo_reflection_extension___construct, 0) + ZEND_ME(reflection_zend_extension, __construct, arginfo_reflection_zend_extension___construct, 0) ZEND_ME(reflection_zend_extension, __toString, arginfo_reflection__void, 0) ZEND_ME(reflection_zend_extension, getName, arginfo_reflection__void, 0) ZEND_ME(reflection_zend_extension, getVersion, arginfo_reflection__void, 0) |