diff options
| -rw-r--r-- | ext/iconv/iconv.c | 1 | ||||
| -rw-r--r-- | ext/tidy/tidy.c | 1 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 2 | ||||
| -rw-r--r-- | main/output.c | 2 | ||||
| -rw-r--r-- | main/php_output.h | 3 |
5 files changed, 0 insertions, 9 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 8699174b3a..59d3985813 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -401,7 +401,6 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c { char *s, *content_type, *mimetype = NULL; int output_status, mimetype_len = 0; - PHP_OUTPUT_TSRMLS(output_context); if (output_context->op & PHP_OUTPUT_HANDLER_START) { output_status = php_output_get_status(); diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index f570da6d50..cdda540586 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -1149,7 +1149,6 @@ static int php_tidy_output_handler(void **nothing, php_output_context *output_co int status = FAILURE; TidyDoc doc; TidyBuffer inbuf, outbuf, errbuf; - PHP_OUTPUT_TSRMLS(output_context); if (TG(clean_output) && (output_context->op & PHP_OUTPUT_HANDLER_START) && (output_context->op & PHP_OUTPUT_HANDLER_FINAL)) { doc = tidyCreate(); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 2d141597ed..7abd7cfd6c 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -124,7 +124,6 @@ static int php_zlib_output_encoding(void) static int php_zlib_output_handler_ex(php_zlib_context *ctx, php_output_context *output_context) { int flags = Z_SYNC_FLUSH; - PHP_OUTPUT_TSRMLS(output_context); if (output_context->op & PHP_OUTPUT_HANDLER_START) { /* start up */ @@ -210,7 +209,6 @@ static int php_zlib_output_handler_ex(php_zlib_context *ctx, php_output_context static int php_zlib_output_handler(void **handler_context, php_output_context *output_context) { php_zlib_context *ctx = *(php_zlib_context **) handler_context; - PHP_OUTPUT_TSRMLS(output_context); if (!php_zlib_output_encoding()) { /* "Vary: Accept-Encoding" header sent along uncompressed content breaks caching in MSIE, diff --git a/main/output.c b/main/output.c index 5c56fe98cd..831c11f14a 100644 --- a/main/output.c +++ b/main/output.c @@ -909,7 +909,6 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl { php_output_handler_status_t status; int original_op = context->op; - PHP_OUTPUT_TSRMLS(context); #if PHP_OUTPUT_DEBUG fprintf(stderr, ">>> op(%d, " @@ -1249,7 +1248,6 @@ static inline int php_output_stack_pop(int flags) static int php_output_handler_compat_func(void **handler_context, php_output_context *output_context) { php_output_handler_func_t func = *(php_output_handler_func_t *) handler_context; - PHP_OUTPUT_TSRMLS(output_context); if (func) { char *out_str = NULL; diff --git a/main/php_output.h b/main/php_output.h index 4950c8d3a2..6bb89a7458 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -104,9 +104,6 @@ typedef struct _php_output_context { php_output_buffer out; } php_output_context; -/* 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); /* new-style, opaque context callback */ |