* remove builtin exception class

diff --git a/Zend/zend.c b/Zend/zend.c
index 83dfe50ec6aafe7b4b52bb59dac2e28c4a9e3f1a..0eac84f3cda410b41a5451eb9cb62d787a600e92 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -45,7 +45,6 @@ BOOL WINAPI IsDebuggerPresent(VOID);
 
 /* true multithread-shared globals */
 ZEND_API zend_class_entry *zend_standard_class_def = NULL;
-ZEND_API zend_class_entry *zend_exception_class_def = NULL;
 ZEND_API int (*zend_printf)(const char *format, ...);
 ZEND_API zend_write_func_t zend_write;
 ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
@@ -272,33 +271,6 @@ static void register_standard_class(void)
 }
 
 
-static void register_exception_class(void)
-{
-       zend_exception_class_def = malloc(sizeof(zend_class_entry));
-       
-       zend_exception_class_def->type = ZEND_INTERNAL_CLASS;
-       zend_exception_class_def->name_length = sizeof("Exception") - 1;
-       zend_exception_class_def->name = zend_strndup("Exception", zend_exception_class_def->name_length);
-       zend_exception_class_def->parent = NULL;
-       zend_hash_init_ex(&zend_exception_class_def->default_properties, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
-       zend_hash_init_ex(&zend_exception_class_def->private_properties, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
-       zend_hash_init_ex(&zend_exception_class_def->protected_properties, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
-       zend_exception_class_def->static_members = (HashTable *) malloc(sizeof(HashTable));
-       zend_hash_init_ex(zend_exception_class_def->static_members, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
-       zend_hash_init_ex(&zend_exception_class_def->constants_table, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
-       zend_hash_init_ex(&zend_exception_class_def->class_table, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
-       zend_hash_init_ex(&zend_exception_class_def->function_table, 0, NULL, ZEND_FUNCTION_DTOR, 1, 0);
-       zend_exception_class_def->constructor = NULL;
-       zend_exception_class_def->destructor = NULL;
-       zend_exception_class_def->clone = NULL;
-       zend_exception_class_def->handle_function_call = NULL;
-       zend_exception_class_def->handle_property_get = NULL;
-       zend_exception_class_def->handle_property_set = NULL;
-       zend_exception_class_def->refcount = 1;
-       zend_hash_add(GLOBAL_CLASS_TABLE, "exception", sizeof("exception"), &zend_exception_class_def, sizeof(zend_class_entry *), NULL);
-}
-
-
 static void zend_set_default_compile_time_values(TSRMLS_D)
 {
        /* default compile-time values */
@@ -472,7 +444,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
        zend_hash_init_ex(GLOBAL_AUTO_GLOBALS_TABLE, 8, NULL, NULL, 1, 0);
 
        register_standard_class();
-       register_exception_class();
        zend_hash_init_ex(&module_registry, 50, NULL, ZEND_MODULE_DTOR, 1, 0);
        zend_init_rsrc_list_dtors();