diff options
| author | Xinchen Hui <laruence@php.net> | 2014-08-14 11:52:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-08-14 11:52:46 +0800 |
| commit | bfc1ae07bec3bda6dc0522da50b35ba093d4247c (patch) | |
| tree | ce6d954be2be675df92a9cab7c662bc73a6491e0 /main/php_output.h | |
| parent | 35dd200430994b1b2807633e5d5dd3370b59633e (diff) | |
| parent | 73fe4186370d8ca8bd0b8a4a8f995852cb42fa75 (diff) | |
| download | php-git-bfc1ae07bec3bda6dc0522da50b35ba093d4247c.tar.gz | |
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/php_output.h b/main/php_output.h index 45af14f6a5..f8b961c7c3 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -127,8 +127,7 @@ typedef struct _php_output_handler_user_func_t { } php_output_handler_user_func_t; typedef struct _php_output_handler { - char *name; - size_t name_len; + zend_string *name; int flags; int level; size_t size; |