From 39aa59bdecad946203481dfd13fd8808d3f09425 Mon Sep 17 00:00:00 2001
From: Zeev Suraski <zeev@php.net>
Date: Thu, 27 Apr 2000 18:37:02 +0000
Subject: More error handling work (still completely disabled)

---
 main/php.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'main/php.h')

diff --git a/main/php.h b/main/php.h
index b7867bfcbf..326bbfc7e8 100644
--- a/main/php.h
+++ b/main/php.h
@@ -242,13 +242,20 @@ extern char **environ;
 #endif
 
 extern void phperror(char *error);
-extern PHPAPI void php_error(int type, const char *format, ...);
 extern PHPAPI int php_write(void *buf, int size);
 extern PHPAPI int php_printf(const char *format, ...);
 extern void php_log_err(char *log_message);
 extern int Debug(char *format, ...);
 extern int cfgparse(void);
 
+#if ZEND_NEW_ERROR_HANDLING
+#define php_error zend_error
+#else
+extern PHPAPI void php_error_cb(int type, const char *format, ...);
+#define php_error php_error_cb
+#endif
+
+
 extern void html_putc(char c);
 
 #define zenderror phperror
-- 
cgit v1.2.1