diff options
| author | Julien Pauli <jpauli@php.net> | 2015-08-17 17:18:25 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-08-17 17:18:25 +0200 |
| commit | aae9004ebdf42fbebafa461902009a936285415c (patch) | |
| tree | c45cb9588aeed60f2744ce41cc042c85787f8a20 /main | |
| parent | 5f54027d045fe00c5dc662310d48933b56c2f9ae (diff) | |
| download | php-git-aae9004ebdf42fbebafa461902009a936285415c.tar.gz | |
Removed dead code
Diffstat (limited to 'main')
| -rw-r--r-- | main/output.c | 2 | ||||
| -rw-r--r-- | main/php_output.h | 3 |
2 files changed, 0 insertions, 5 deletions
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 */ |