- update TS macro usage

1 files changed, 26 insertions, 27 deletions

diff --git a/README.NEW-OUTPUT-API b/README.NEW-OUTPUT-API
index a6b0fe206f..f7086d901a 100644
--- a/README.NEW-OUTPUT-API
+++ b/README.NEW-OUTPUT-API
@@ -3,104 +3,103 @@ $Id$
 
 API adjustment to the old output control code:
 
-	Everything now resides beneath the php_output namespace, and there's an 
-	API call for every output handler op.  However, there's a thin 
-	compatibility layer unless PHP_OUTPUT_NOCOMPAT is defined.
+	Everything now resides beneath the php_output namespace, 
+	and there's an API call for every output handler op.
 
 	Checking output control layers status:
 		// Using OG()
-		php_output_get_status();
+		php_output_get_status(TSRMLS_C);
 
 	Starting the default output handler:
 		// php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
-		php_output_start_default();
+		php_output_start_default(TSRMLS_C);
 
 	Starting an user handler by zval:
 		// php_start_ob_buffer(zhandler, chunk_size, erase TSRMLS_CC);
-		php_output_start_user(zhandler, chunk_size, flags);
+		php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC);
 
 	Starting an internal handler whithout context:
 		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase TSRMLS_CC);
-		php_output_start_internal(handler_name_zval, my_php_output_handler_func_t, chunk_size, flags);
+		php_output_start_internal(handler_name_zval, my_php_output_handler_func_t, chunk_size, flags TSRMLS_CC);
 
 	Starting an internal handler with context:
 		// not possible with old API
 		php_output_handler *h;
-		h = php_output_handler_create_internal(handler_name_zval, my_php_output_handler_context_func_t, chunk_size, flags);
+		h = php_output_handler_create_internal(handler_name_zval, my_php_output_handler_context_func_t, chunk_size, flags TSRMLS_CC);
 		php_output_handler_set_context(h, my_context, my_context_dtor);
-		php_output_handler_start(h);
+		php_output_handler_start(h TSRMLS_CC);
 
 	Testing whether a certain output handler has already been started:
 		// php_ob_handler_used("output handler name" TSRMLS_CC);
-		php_output_handler_started(handler_name_zval);
+		php_output_handler_started(handler_name_zval TSRMLS_CC);
 
 	Flushing one output buffer:
 		// php_ob_end_buffer(1, 1 TSRMLS_CC);
-		php_output_flush();
+		php_output_flush(TSRMLS_C);
 
 	Flushing all output buffers:
 		// not possible with old API
-		php_output_flush_all();
+		php_output_flush_all(TSRMLS_C);
 
 	Cleaning one output buffer:
 		// php_ob_end_buffer(0, 1 TSRMLS_CC);
-		php_output_clean();
+		php_output_clean(TSRMLS_C);
 
 	Cleaning all output buffers:
 		// not possible with old API
-		php_output_clean_all();
+		php_output_clean_all(TSRMLS_C);
 
 	Discarding one output buffer:
 		// php_ob_end_buffer(0, 0 TSRMLS_CC);
-		php_output_discard();
+		php_output_discard(TSRMLS_C);
 
 	Discarding all output buffers:
 		// php_ob_end_buffers(0 TSRMLS_CC);
-		php_output_discard_all();
+		php_output_discard_all(TSRMLS_C);
 
 	Stopping (and dropping) one output buffer:
 		// php_ob_end_buffer(1, 0 TSRMLS_CC)
-		php_output_end();
+		php_output_end(TSRMLS_C);
 
 	Stopping (and dropping) all output buffers:
 		// php_ob_end_buffers(1, 0 TSRMLS_CC);
-		php_output_end_all();
+		php_output_end_all(TSRMLS_C);
 
 	Retrieving output buffers contents:
 		// php_ob_get_buffer(zstring TSRMLS_CC);
-		php_output_get_contents(zstring);
+		php_output_get_contents(zstring TSRMLS_CC);
 
 	Retrieving output buffers length:
 		// php_ob_get_length(zlength TSRMLS_CC);
-		php_output_get_length(zlenght);
+		php_output_get_length(zlength TSRMLS_CC);
 
 	Retrieving output buffering level:
 		// OG(nesting_level);
-		php_output_get_level();
+		php_output_get_level(TSRMLS_C);
 
 	Issue a warning because of an output handler conflict:
 		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name" TSRMLS_CC);
-		php_output_handler_conflict(new_handler_name_zval, set_handler_name_zval);
+		php_output_handler_conflict(new_handler_name_zval, set_handler_name_zval TSRMLS_CC);
 
 	Registering a conflict checking function, which will be checked prior starting the handler:
 		// not possible with old API, unless hardcoding into output.c
-		php_output_handler_conflict_register(handler_name_zval, my_php_output_handler_conflict_check_t);
+		php_output_handler_conflict_register(handler_name_zval, my_php_output_handler_conflict_check_t TSRMLS_CC);
 
 	Registering a reverse conflict checking function, which will be checked prior starting the specified foreign handler:
 		// not possible with old API
-		php_output_handler_reverse_conflict_register(foreign_handler_name_zval, my_php_output_handler_conflict_check_t);
+		php_output_handler_reverse_conflict_register(foreign_handler_name_zval, my_php_output_handler_conflict_check_t TSRMLS_CC);
 
 	Facilitating a context from within an output handler callable with ob_start():
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr TSRMLS_CC);
 
 	Disabling of the output handler by itself:
 		//not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL TSRMLS_CC);
 
 	Marking an output handler immutable by itself because of irreversibility of its operation:
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);
 
 	Restarting the output handler because of a CLEAN operation:
 		// not possible with old API