Removed dead code

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 8699174b3a1138f2b5b4999fd06528c0d99d4b43..59d3985813e5f43509653d7c658300e24676dd83 100644 (file)
--- 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 f570da6d505dbeb22a6fbb38f257d1fdb3a45f04..cdda540586e209c347c9a8c68fc07bbc615d8435 100644 (file)
--- 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 2d141597edfe6c4af7fd2d5687ce049285ce7c81..7abd7cfd6ca1c1d64187d582d437faccf3c50ec0 100644 (file)
--- 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 5c56fe98cd6a202c138b79c1d2f9c57299c3f528..831c11f14a7401eabcdd0e8264de21116e29ca9e 100644 (file)
--- 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 4950c8d3a23142fd931175dca743e0388062a420..6bb89a7458428e0c9efce2dc8ef9bfc689e164b4 100644 (file)
--- 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 */