zend_default_classes.h -> zend_exceptions.h

diff --git a/Zend/zend_default_classes.h b/Zend/zend_default_classes.h
deleted file mode 100644 (file)
index 68dd208..0000000
--- a/Zend/zend_default_classes.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2004 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Sterling Hughes <sterling@php.net>                          |
-   |          Marcus Boerger <helly@php.net>                              |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef ZEND_DEFAULT_CLASSES_H
-#define ZEND_DEFAULT_CLASSES_H
-
-BEGIN_EXTERN_C()
-
-ZEND_API zend_class_entry *zend_exception_get_default(void);
-ZEND_API void zend_register_default_classes(TSRMLS_D);
-
-/* exception_ce   NULL or zend_exception_get_default() or a derived class 
- * message        NULL or the message of the exception */
-ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC);
-ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, char *format, ...);
-ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC);
-
-/* show an exception using zend_error(E_ERROR,...) */
-ZEND_API void zend_exception_error(zval *exception TSRMLS_DC);
-
-END_EXTERN_C()
-
-#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- */

diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index b63458481f14cea9006dfefd48aca8569476cfe6..cfce3b93743e9b5e7558cf7d2b280b7cd057636e 100644 (file)
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@ -27,7 +27,7 @@
 #include "ext/standard/info.h"
 #include "php_com_dotnet.h"
 #include "php_com_dotnet_internal.h"
-#include "Zend/zend_default_classes.h"
+#include "Zend/zend_exceptions.h"
 
 /* {{{ com_create_instance - ctor for COM class */
 PHP_FUNCTION(com_create_instance)

diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c
index cbcc7bbbe4748d690011cd6b7a05865d2052bc28..84137cfd874190632dcbda88a94e9111cc00f5af 100644 (file)
--- a/ext/com_dotnet/com_dotnet.c
+++ b/ext/com_dotnet/com_dotnet.c
@@ -29,7 +29,7 @@
 # include "ext/standard/info.h"
 # include "php_com_dotnet.h"
 # include "php_com_dotnet_internal.h"
-# include "Zend/zend_default_classes.h"
+# include "Zend/zend_exceptions.h"
 # include <mscoree.h>
 
 struct dotnet_runtime_stuff {

diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c
index 50c665dbba76e036544af8b2bc8b3cf9b8c32d43..438536645d553ae35ee051c22aa8aeab5d66582a 100644 (file)
--- a/ext/com_dotnet/com_extension.c
+++ b/ext/com_dotnet/com_extension.c
@@ -27,7 +27,7 @@
 #include "ext/standard/info.h"
 #include "php_com_dotnet.h"
 #include "php_com_dotnet_internal.h"
-#include "Zend/zend_default_classes.h"
+#include "Zend/zend_exceptions.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(com_dotnet)
 TsHashTable php_com_typelibraries;

diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c
index 0811fddec2388b2991a75f5c74a54305f79fcab4..2c247d7c802168eec8f11c79c82dee786f318b39 100644 (file)
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@ -27,7 +27,7 @@
 #include "ext/standard/info.h"
 #include "php_com_dotnet.h"
 #include "php_com_dotnet_internal.h"
-#include "Zend/zend_default_classes.h"
+#include "Zend/zend_exceptions.h"
 
 static zval *com_property_read(zval *object, zval *member, zend_bool silent TSRMLS_DC)
 {

diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c
index 8df049601f6ec81ae056b0411937742f691288e2..945eea1ea5739443a1316980c1ee31eb75206cb4 100644 (file)
--- a/ext/com_dotnet/com_iterator.c
+++ b/ext/com_dotnet/com_iterator.c
@@ -27,7 +27,7 @@
 #include "ext/standard/info.h"
 #include "php_com_dotnet.h"
 #include "php_com_dotnet_internal.h"
-#include "Zend/zend_default_classes.h"
+#include "Zend/zend_exceptions.h"
 
 struct php_com_iterator {
        zend_object_iterator iter;

diff --git a/ext/com_dotnet/com_misc.c b/ext/com_dotnet/com_misc.c
index f4e54cd722da7f84f24fd5b9db0253a5c2680388..641935ff25dca1eff9c977de15737922ff0c1fd8 100644 (file)
--- a/ext/com_dotnet/com_misc.c
+++ b/ext/com_dotnet/com_misc.c
@@ -27,7 +27,7 @@
 #include "ext/standard/info.h"
 #include "php_com_dotnet.h"
 #include "php_com_dotnet_internal.h"
-#include "Zend/zend_default_classes.h"
+#include "Zend/zend_exceptions.h"
 
 void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC)
 {

diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c
index a8485b688c5aa2433656d1b95c89e201a2dabeeb..67fa18bea194c3081c8e2ca79b16ee4bf1ddbbf7 100644 (file)
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@ -32,7 +32,7 @@
 #include "ext/standard/info.h"
 #include "php_com_dotnet.h"
 #include "php_com_dotnet_internal.h"
-#include "Zend/zend_default_classes.h"
+#include "Zend/zend_exceptions.h"
 
 typedef struct {
        /* the object we a proxying for; we hold a refcount to it */

diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h
index 64ea2c9e647b9989d799e1f93955c0c9a4c5e06b..b30a144fd202c455da992f7a83890c3950e57abe 100644 (file)
--- a/ext/dom/php_dom.h
+++ b/ext/dom/php_dom.h
@@ -56,7 +56,7 @@ extern zend_module_entry dom_module_entry;
 
 #include "xml_common.h"
 #include "ext/libxml/php_libxml.h"
-#include "zend_default_classes.h"
+#include "zend_exceptions.h"
 #include "dom_ce.h"
 /* DOM API_VERSION, please bump it up, if you change anything in the API
     therefore it's easier for the script-programmers to check, what's working how

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 8a46e8e0064a0ccc5f94de905e3b5fbcba4d3aac..0eafacb5e6fbc292bcca4bcaef5635642d28a457 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -33,7 +33,7 @@
 #include "php_globals.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_string.h"
-#include "zend_default_classes.h"
+#include "zend_exceptions.h"
 
 #if HAVE_MYSQL
 

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index a6d39f9af57cceaeed53977c569b70b259ca7d7a..9bf75d9bbb52cbab2f19ed361be8ec34fa4d8b03 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -29,7 +29,7 @@
 #include "ext/standard/info.h"
 #include "ext/standard/php_string.h"
 #include "php_mysqli.h"
-#include "zend_default_classes.h"
+#include "zend_exceptions.h"
 
 #define MYSQLI_STORE_RESULT 0
 #define MYSQLI_USE_RESULT 1

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index c2e3f09cc0e5f0557185578047bb2fd5e147f20f..3e2e8a2c5aff55eca10af12acf3516ba70adbe5e 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -37,7 +37,7 @@
 #include "ext/standard/php_smart_str.h"
 #include "php_pgsql.h"
 #include "php_globals.h"
-#include "zend_default_classes.h"
+#include "zend_exceptions.h"
 
 #if HAVE_PGSQL
 

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 3615a82ff518789ca74d5afd448973a62d0c9784..dd29b368b248a4bfb0162a34d9e5adc76290e2b5 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -32,7 +32,7 @@
 #include "ext/standard/php_string.h"
 #include "php_simplexml.h"
 #include "php_simplexml_exports.h"
-#include "zend_default_classes.h"
+#include "zend_exceptions.h"
 #include "zend_interfaces.h"
 #if HAVE_SPL && !defined(COMPILE_DL_SPL)
 #include "ext/spl/spl_sxe.h"

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index f63a14584bedf02a0fb77243e5dee75554fee5ae..6826c6a7334a642eb2adeee00ef6f8b1af6ea7dd 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -25,7 +25,7 @@
 #include "php_soap.h"
 #include "ext/session/php_session.h"
 #ifdef ZEND_ENGINE_2
-#  include "zend_default_classes.h"
+#  include "zend_exceptions.h"
 #endif
 
 static int le_sdl = 0;

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 04cd12b46c1565784d717737174f0c90a3d59297..e8431e8b4e3acdd3cd9123f221f54f6e3eda99e4 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -26,7 +26,7 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "zend_compile.h"
-#include "zend_default_classes.h"
+#include "zend_exceptions.h"
 #include "zend_interfaces.h"
 
 #include "php_spl.h"

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index a35ad872d6438ebdb31739202580ac54ecd4929c..fc22ff4f99b3c0bf55b576b550d20568e0dcf757 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -25,7 +25,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
-#include "zend_default_classes.h"
+#include "zend_exceptions.h"
 #include "zend_interfaces.h"
 
 #include "php_spl.h"

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index b712ed8c2e7391dfeffddc83d8ac331365282c1f..f408495d8bce17d03474dc687e20f708ab1d3a72 100644 (file)
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -41,7 +41,7 @@
 
 #include <sqlite.h>
 
-#include "zend_default_classes.h"
+#include "zend_exceptions.h"
 
 #ifndef safe_emalloc
 # define safe_emalloc(a,b,c) emalloc((a)*(b)+(c))

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 30f0688e876342cf3389466118488d13e68bfa64..1164b45881680348219e946458f594d645495027 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -32,7 +32,7 @@
 #include "safe_mode.h"
 #include "Zend/zend_API.h"
 #include "Zend/zend_hash.h"
-#include "Zend/zend_default_classes.h"
+#include "Zend/zend_exceptions.h"
 #include "Zend/zend_object_handlers.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(tidy)

diff --git a/main/main.c b/main/main.c
index deaf5f865ecd39599d08ba1fc31ada8d0e201c5e..c12a659e71c1fb5d74356a11b0719b7ce8c9dd36 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -71,7 +71,7 @@
 #include "win32/php_registry.h"
 #endif
 #include "php_syslog.h"
-#include "Zend/zend_default_classes.h"
+#include "Zend/zend_exceptions.h"
 
 #if PHP_SIGCHILD
 #include <sys/types.h>