X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ferror.c;h=c130e71a268f61011e9beb5718c707f1c8326c60;hb=2cef1aee122dcdcf0d1a63a45528fdcb0ee4221e;hp=c92b847e3530859083ce001bcb6f24237de36db0;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84;p=m6w6%2Fext-psi

diff --git a/src/error.c b/src/error.c
index c92b847..c130e71 100644
--- a/src/error.c
+++ b/src/error.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 #include "data.h"
 
 /* zend_error_cb */
@@ -57,7 +61,7 @@ void psi_error_wrapper(struct psi_data *context, struct psi_token *t, int type,
 	}
 
 	if (t) {
-		fn = t->file;
+		fn = t->file->val;
 		ln = t->line;
 	} else if (zend_is_executing()) {
 		fn = zend_get_executed_filename();
@@ -71,6 +75,11 @@ void psi_error_wrapper(struct psi_data *context, struct psi_token *t, int type,
 
 	va_start(argv, msg);
 	psi_verror(type, fn, ln, msg, argv);
+#ifdef __clang__
+	va_end(argv);
+	va_start(argv, msg);
+#endif
+	PSI_DEBUG_PRINTV(context, msg, argv);
 	va_end(argv);
 
 	if (context) {