first shot remove TSRMLS_* things

1 files changed, 14 insertions, 14 deletions

diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
index 285f6c044e..a4682477c3 100644
--- a/Zend/zend_dtrace.c
+++ b/Zend/zend_dtrace.c
@@ -24,7 +24,7 @@
 
 #ifdef HAVE_DTRACE
 /* PHP DTrace probes {{{ */
-static inline const char *dtrace_get_executed_filename(TSRMLS_D)
+static inline const char *dtrace_get_executed_filename(void)
 {
 	zend_execute_data *ex = EG(current_execute_data);
 
@@ -34,22 +34,22 @@ static inline const char *dtrace_get_executed_filename(TSRMLS_D)
 	if (ex) {
 		return ex->func->op_array.filename->val;
 	} else {
-		return zend_get_executed_filename(TSRMLS_C);
+		return zend_get_executed_filename();
 	}
 }
 
-ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC)
+ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type)
 {
 	zend_op_array *res;
 	DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, (char *)file_handle->filename);
-	res = compile_file(file_handle, type TSRMLS_CC);
+	res = compile_file(file_handle, type);
 	DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, (char *)file_handle->filename);
 
 	return res;
 }
 
 /* We wrap the execute function to have fire the execute-entry/return and function-entry/return probes */
-ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
+ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data)
 {
 	int lineno;
 	const char *scope, *filename, *funcname, *classname;
@@ -58,13 +58,13 @@ ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
 	/* we need filename and lineno for both execute and function probes */
 	if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()
 		|| DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
-		filename = dtrace_get_executed_filename(TSRMLS_C);
-		lineno = zend_get_executed_lineno(TSRMLS_C);
+		filename = dtrace_get_executed_filename();
+		lineno = zend_get_executed_lineno();
 	}
 
 	if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
-		classname = get_active_class_name(&scope TSRMLS_CC);
-		funcname = get_active_function_name(TSRMLS_C);
+		classname = get_active_class_name(&scope);
+		funcname = get_active_function_name();
 	}
 
 	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
@@ -75,7 +75,7 @@ ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
 		DTRACE_FUNCTION_ENTRY((char *)funcname, (char *)filename, lineno, (char *)classname, (char *)scope);
 	}
 
-	execute_ex(execute_data TSRMLS_CC);
+	execute_ex(execute_data);
 
 	if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname != NULL) {
 		DTRACE_FUNCTION_RETURN((char *)funcname, (char *)filename, lineno, (char *)classname, (char *)scope);
@@ -86,20 +86,20 @@ ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
 	}
 }
 
-ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data, zval *return_value TSRMLS_DC)
+ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data, zval *return_value)
 {
 	int lineno;
 	const char *filename;
 	if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()) {
-		filename = dtrace_get_executed_filename(TSRMLS_C);
-		lineno = zend_get_executed_lineno(TSRMLS_C);
+		filename = dtrace_get_executed_filename();
+		lineno = zend_get_executed_lineno();
 	}
 
 	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
 		DTRACE_EXECUTE_ENTRY((char *)filename, lineno);
 	}
 
-	execute_internal(execute_data, return_value TSRMLS_CC);
+	execute_internal(execute_data, return_value);
 
 	if (DTRACE_EXECUTE_RETURN_ENABLED()) {
 		DTRACE_EXECUTE_RETURN((char *)filename, lineno);