Revert what I think is an accidental commit by Marcus that slipped in at revision...

diff --git a/Zend/zend_default_classes.c b/Zend/zend_default_classes.c
index db4617bf6ef60e432ed55cd34595f6b708af0d25..4d6b6f5d81558530e1cfec816243e58c0139b44a 100644 (file)
--- a/Zend/zend_default_classes.c
+++ b/Zend/zend_default_classes.c
@@ -333,7 +333,7 @@ ZEND_METHOD(exception, tostring)
  */
 static zend_function_entry default_exception_functions[] = {
        ZEND_ME(exception, __construct, NULL, 0)
-       ZEND_ME(exception, getmessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+       ZEND_ME(exception, getmessage, NULL, 0) /* non final for now */
        ZEND_ME(exception, getcode, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
        ZEND_ME(exception, getfile, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
        ZEND_ME(exception, getline, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index db4617bf6ef60e432ed55cd34595f6b708af0d25..4d6b6f5d81558530e1cfec816243e58c0139b44a 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -333,7 +333,7 @@ ZEND_METHOD(exception, tostring)
  */
 static zend_function_entry default_exception_functions[] = {
        ZEND_ME(exception, __construct, NULL, 0)
-       ZEND_ME(exception, getmessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+       ZEND_ME(exception, getmessage, NULL, 0) /* non final for now */
        ZEND_ME(exception, getcode, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
        ZEND_ME(exception, getfile, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
        ZEND_ME(exception, getline, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)