diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /main/php_output.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_output.h b/main/php_output.h index f2f5848280..acea05617e 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -130,10 +130,10 @@ typedef struct _php_output_handler { int level; size_t size; php_output_buffer buffer; - + void *opaq; void (*dtor)(void *opaq); - + union { php_output_handler_user_func_t *user; php_output_handler_context_func_t internal; |