From: Antony Dovgal <tony2001@php.net>
Date: Sun, 25 Apr 2010 19:17:16 +0000 (+0000)
Subject: fix ~450 tests and 25 segfaults
X-Git-Tag: php-5.4.0alpha1~191^2~1661
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7211284ac7f217694f2f351ec223f94af7db0d16;p=php

fix ~450 tests and 25 segfaults
make test, anyone?
---

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 40c7b1cfd0..301037ade5 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -90,6 +90,7 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
 		zend_get_object_classname(exception, &classname, &name_len);
 		DTRACE_EXCEPTION_THROWN(classname);
 	}
+#endif /* HAVE_DTRACE */
 
 	if (exception != NULL) {
 		zval *previous = EG(exception);
@@ -102,7 +103,6 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
 	if (!EG(current_execute_data)) {
 		zend_error(E_ERROR, "Exception thrown without a stack frame");
 	}
-#endif /* HAVE_DTRACE */
 
 	if (zend_throw_exception_hook) {
 		zend_throw_exception_hook(exception TSRMLS_CC);