summaryrefslogtreecommitdiff
path: root/Zend/zend_errors.h
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2006-05-09 23:53:23 +0000
committerMarcus Boerger <helly@php.net>2006-05-09 23:53:23 +0000
commit637a40423cd7632b2800814c2ba3ad9b95bbd2f4 (patch)
tree485f1dd7cf12d0bfe693961120360b965d66c195 /Zend/zend_errors.h
parent57184454e9e3ccecb2b55dc71cd7dc1aa65a3ad3 (diff)
downloadphp-git-637a40423cd7632b2800814c2ba3ad9b95bbd2f4.tar.gz
- MFH as discussed
. zend_exception_get_default() -> zend_exception_get_default(TSRMLS_D) . zend_get_error_exception() -> zend_get_error_exception(TSRMLS_D) . added E_RECOVERABLE_ERROR . added ZEND_TOSTRING_FUNC_NAME . added __tostring function cache to zend_class_entry . added ZEND_NAMED_ME . modified ZEND_ME_MAPPING to support method flags . added ZEND_MN . method entries now use prefix "zim_" instead of "zif_" . drop EG(ze1_compatibility_mode) . changed cast handler, now without (int should_free): typedef int (*zend_object_cast_t)(zval *readobj, zval *retval, int type TSRMLS_DC); . changed get_iterator, now receives whether value is by ref: zend_object_iterator *(*get_iterator)(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); . added zend_objects_store_add_ref_by_handle . added zend_objects_store_del_ref_by_handle . convert_to_explicit_type(pzv, type)
Diffstat (limited to 'Zend/zend_errors.h')
-rw-r--r--Zend/zend_errors.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
index c7c893239d..8322b74216 100644
--- a/Zend/zend_errors.h
+++ b/Zend/zend_errors.h
@@ -34,8 +34,9 @@
#define E_USER_WARNING (1<<9L)
#define E_USER_NOTICE (1<<10L)
#define E_STRICT (1<<11L)
+#define E_RECOVERABLE_ERROR (1<<12L)
-#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE)
+#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT | E_RECOVERABLE_ERROR)
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
#endif /* ZEND_ERRORS_H */