diff options
| author | Anatol Belski <ab@php.net> | 2014-10-13 13:52:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-13 13:52:31 +0200 |
| commit | 19c41e1f538e854fa8450715791c44f55e909588 (patch) | |
| tree | ff89ca91ab2e7d0add6d6e8d056536547c281498 /Zend/zend.c | |
| parent | e1cd0e0a38deb91d24ded68df010b7f6c03d2cb6 (diff) | |
| parent | 702a2dfb3ef3c603d89bf7e4e9a63b6f8ff8968d (diff) | |
| download | php-git-19c41e1f538e854fa8450715791c44f55e909588.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST.
Ensure __LINE__ is always accurate
Fix incdec of referenced properties
Fix ::jsonSerialize() failure message
Fix invalid zend_string_frees in reflection
Remove retval member in spl_dllist
DLL export several APIs needed for phpdbg
More fixes for nodelist array access - testing for null property read - no zval copying if the type is already long - memory fix for master
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index a7d3bc156e..8c10125fe3 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -822,7 +822,7 @@ ZEND_API void _zend_bailout(char *filename, uint lineno) /* {{{ */ /* }}} */ END_EXTERN_C() -void zend_append_version_info(const zend_extension *extension) /* {{{ */ +ZEND_API void zend_append_version_info(const zend_extension *extension) /* {{{ */ { char *new_info; uint new_info_length; |