diff options
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/main/php_output.h b/main/php_output.h index 535b09b46c..bf756de5ce 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -102,12 +102,10 @@ 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) +/* XXX remove this after TLS branch merge */ +#define PHP_OUTPUT_TSRMLS(ctx) /* old-style, stateless callback */ typedef void (*php_output_handler_func_t)(char *output, size_t output_len, char **handled_output, size_t *handled_output_len, int mode TSRMLS_DC); @@ -155,7 +153,7 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output); /* there should not be a need to use OG() from outside of output.c */ #ifdef ZTS -# define OG(v) TSRMG(output_globals_id, zend_output_globals *, v) +# define OG(v) ZEND_TSRMG(output_globals_id, zend_output_globals *, v) #else # define OG(v) (output_globals.v) #endif |