diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-16 21:55:08 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-16 21:55:08 +0200 |
| commit | 71675a4bf830d7b9400663275fe48275480d34f4 (patch) | |
| tree | 8ce9b1fdda30d26121334fb5c228df7884f6f7c2 /Zend/zend.h | |
| parent | f72d6f97ecf976f00abc0dc21b5d1ef4838de60a (diff) | |
| parent | 8b66d64b2343bc4fd8aeabb690024edb850a0155 (diff) | |
| download | php-git-71675a4bf830d7b9400663275fe48275480d34f4.tar.gz | |
Merge remote-tracking branch 'php-src/phpng' into ast
Conflicts:
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_language_parser.y
Incomplete merge!
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 5548c7be1b..0520d4dda1 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -609,7 +609,7 @@ END_EXTERN_C() BEGIN_EXTERN_C() ZEND_API char *get_zend_version(void); -ZEND_API int zend_make_printable_zval(zval *expr, zval *expr_copy); +ZEND_API int zend_make_printable_zval(zval *expr, zval *expr_copy TSRMLS_DC); ZEND_API int zend_print_zval(zval *expr, int indent TSRMLS_DC); ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent TSRMLS_DC); ZEND_API void zend_print_zval_r(zval *expr, int indent TSRMLS_DC); |