Skip to content

Commit

Permalink
Merge branch 'PHP-5.4' into PHP-5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
nikic committed Aug 23, 2013
2 parents c1ecdfb + 5ab6d21 commit 686402a
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions Zend/zend_dtrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
}

if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
filename = dtrace_get_executed_filename(TSRMLS_C);
classname = get_active_class_name(&scope TSRMLS_CC);
funcname = get_active_function_name(TSRMLS_C);
lineno = zend_get_executed_lineno(TSRMLS_C);
}

if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
Expand Down

0 comments on commit 686402a

Please sign in to comment.