summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-04-27 18:37:02 +0000
committerZeev Suraski <zeev@php.net>2000-04-27 18:37:02 +0000
commit39aa59bdecad946203481dfd13fd8808d3f09425 (patch)
treee8717f4282e7a01c70861a31b2f1976420c5410e /main/php.h
parent095f1d91b178ade6bdf629f020369df9cee19ceb (diff)
downloadphp-git-39aa59bdecad946203481dfd13fd8808d3f09425.tar.gz
More error handling work (still completely disabled)
Diffstat (limited to 'main/php.h')
-rw-r--r--main/php.h9
1 files changed, 8 insertions, 1 deletions
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