diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-09-26 11:07:57 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-09-26 11:07:57 +0100 |
| commit | aee0fefedf85f143e69be8f76a9f1a5c1eba8fa0 (patch) | |
| tree | 73a1af7fbfedf66535c4f09da3a9ceecbe14356f /main/php_output.h | |
| parent | 7d36a1a8414ea60c20cf7f49240d450b08174464 (diff) | |
| parent | f7900367116f333b5a4582b29a2c1f7d2d9b6453 (diff) | |
| download | php-git-aee0fefedf85f143e69be8f76a9f1a5c1eba8fa0.tar.gz | |
Merge branch 'native-tls' of https://github.com/php/php-src into native-tls
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/main/php_output.h b/main/php_output.h index 02b2b85d13..bcce8720e1 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -102,13 +102,8 @@ typedef struct _php_output_context { int op; php_output_buffer in; php_output_buffer out; -#ifdef ZTS - void ***tsrm_ls; -#endif } php_output_context; -#define PHP_OUTPUT_TSRMLS(ctx) TSRMLS_FETCH_FROM_CTX((ctx)->tsrm_ls) - /* old-style, stateless callback */ typedef void (*php_output_handler_func_t)(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC); /* new-style, opaque context callback */ |