diff options
| -rw-r--r-- | ext/pdo_dblib/pdo_dblib.c | 6 | ||||
| -rw-r--r-- | ext/pdo_firebird/pdo_firebird.c | 7 | ||||
| -rw-r--r-- | ext/pdo_mysql/pdo_mysql.c | 8 | ||||
| -rw-r--r-- | ext/pdo_oci/pdo_oci.c | 8 | ||||
| -rw-r--r-- | ext/pdo_odbc/pdo_odbc.c | 8 | ||||
| -rw-r--r-- | ext/pdo_pgsql/pdo_pgsql.c | 8 | ||||
| -rw-r--r-- | ext/pdo_sqlite/pdo_sqlite.c | 8 | ||||
| -rw-r--r-- | ext/phar/phar.c | 11 | ||||
| -rw-r--r-- | ext/reflection/php_reflection.c | 6 | ||||
| -rw-r--r-- | ext/xsl/php_xsl.c | 11 |
10 files changed, 10 insertions, 71 deletions
diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c index b36175b9ca..ddce55dc36 100644 --- a/ext/pdo_dblib/pdo_dblib.c +++ b/ext/pdo_dblib/pdo_dblib.c @@ -31,10 +31,6 @@ ZEND_DECLARE_MODULE_GLOBALS(dblib) static PHP_GINIT_FUNCTION(dblib); -static const zend_function_entry pdo_dblib_functions[] = { - PHP_FE_END -}; - static const zend_module_dep pdo_dblib_deps[] = { ZEND_MOD_REQUIRED("pdo") ZEND_MOD_END @@ -54,7 +50,7 @@ zend_module_entry pdo_dblib_module_entry = { #else "pdo_dblib", #endif - pdo_dblib_functions, + NULL, PHP_MINIT(pdo_dblib), PHP_MSHUTDOWN(pdo_dblib), NULL, diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c index 2af4b89724..e1a9bef643 100644 --- a/ext/pdo_firebird/pdo_firebird.c +++ b/ext/pdo_firebird/pdo_firebird.c @@ -26,11 +26,6 @@ #include "php_pdo_firebird.h" #include "php_pdo_firebird_int.h" -static const zend_function_entry pdo_firebird_functions[] = { /* {{{ */ - PHP_FE_END -}; -/* }}} */ - /* {{{ pdo_firebird_deps */ static const zend_module_dep pdo_firebird_deps[] = { ZEND_MOD_REQUIRED("pdo") @@ -42,7 +37,7 @@ zend_module_entry pdo_firebird_module_entry = { /* {{{ */ STANDARD_MODULE_HEADER_EX, NULL, pdo_firebird_deps, "PDO_Firebird", - pdo_firebird_functions, + NULL, PHP_MINIT(pdo_firebird), PHP_MSHUTDOWN(pdo_firebird), NULL, diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index f3310cde41..73b4ccd7b1 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -214,12 +214,6 @@ ZEND_TSRMLS_CACHE_UPDATE(); } /* }}} */ -/* {{{ pdo_mysql_functions[] */ -static const zend_function_entry pdo_mysql_functions[] = { - PHP_FE_END -}; -/* }}} */ - /* {{{ pdo_mysql_deps[] */ static const zend_module_dep pdo_mysql_deps[] = { ZEND_MOD_REQUIRED("pdo") @@ -235,7 +229,7 @@ zend_module_entry pdo_mysql_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, pdo_mysql_deps, "pdo_mysql", - pdo_mysql_functions, + NULL, PHP_MINIT(pdo_mysql), PHP_MSHUTDOWN(pdo_mysql), #if defined(PDO_USE_MYSQLND) && PDO_DBG_ENABLED diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c index 1a49ed001f..efa7c1caf6 100644 --- a/ext/pdo_oci/pdo_oci.c +++ b/ext/pdo_oci/pdo_oci.c @@ -29,12 +29,6 @@ #include <TSRM/TSRM.h> #endif -/* {{{ pdo_oci_functions[] */ -static const zend_function_entry pdo_oci_functions[] = { - PHP_FE_END -}; -/* }}} */ - /* {{{ pdo_oci_module_entry */ static const zend_module_dep pdo_oci_deps[] = { @@ -46,7 +40,7 @@ zend_module_entry pdo_oci_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, pdo_oci_deps, "PDO_OCI", - pdo_oci_functions, + NULL, PHP_MINIT(pdo_oci), PHP_MSHUTDOWN(pdo_oci), PHP_RINIT(pdo_oci), diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c index 875936672f..d0c2f913ff 100644 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c @@ -26,12 +26,6 @@ #include "php_pdo_odbc.h" #include "php_pdo_odbc_int.h" -/* {{{ pdo_odbc_functions[] */ -static const zend_function_entry pdo_odbc_functions[] = { - PHP_FE_END -}; -/* }}} */ - /* {{{ pdo_odbc_deps[] */ static const zend_module_dep pdo_odbc_deps[] = { ZEND_MOD_REQUIRED("pdo") @@ -44,7 +38,7 @@ zend_module_entry pdo_odbc_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, pdo_odbc_deps, "PDO_ODBC", - pdo_odbc_functions, + NULL, PHP_MINIT(pdo_odbc), PHP_MSHUTDOWN(pdo_odbc), NULL, diff --git a/ext/pdo_pgsql/pdo_pgsql.c b/ext/pdo_pgsql/pdo_pgsql.c index d809ee50cb..4764419e47 100644 --- a/ext/pdo_pgsql/pdo_pgsql.c +++ b/ext/pdo_pgsql/pdo_pgsql.c @@ -26,12 +26,6 @@ #include "php_pdo_pgsql.h" #include "php_pdo_pgsql_int.h" -/* {{{ pdo_pgsql_functions[] */ -static const zend_function_entry pdo_pgsql_functions[] = { - PHP_FE_END -}; -/* }}} */ - /* {{{ pdo_sqlite_deps */ static const zend_module_dep pdo_pgsql_deps[] = { ZEND_MOD_REQUIRED("pdo") @@ -44,7 +38,7 @@ zend_module_entry pdo_pgsql_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, pdo_pgsql_deps, "pdo_pgsql", - pdo_pgsql_functions, + NULL, PHP_MINIT(pdo_pgsql), PHP_MSHUTDOWN(pdo_pgsql), NULL, diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c index 7410c06757..60cd4c3c98 100644 --- a/ext/pdo_sqlite/pdo_sqlite.c +++ b/ext/pdo_sqlite/pdo_sqlite.c @@ -27,12 +27,6 @@ #include "php_pdo_sqlite_int.h" #include "zend_exceptions.h" -/* {{{ pdo_sqlite_functions[] */ -static const zend_function_entry pdo_sqlite_functions[] = { - PHP_FE_END -}; -/* }}} */ - /* {{{ pdo_sqlite_deps */ static const zend_module_dep pdo_sqlite_deps[] = { ZEND_MOD_REQUIRED("pdo") @@ -45,7 +39,7 @@ zend_module_entry pdo_sqlite_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, pdo_sqlite_deps, "pdo_sqlite", - pdo_sqlite_functions, + NULL, PHP_MINIT(pdo_sqlite), PHP_MSHUTDOWN(pdo_sqlite), NULL, diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 71ec884281..70f469cab5 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -3207,15 +3207,6 @@ ZEND_TSRMLS_CACHE_DEFINE() ZEND_GET_MODULE(phar) #endif -/* {{{ phar_functions[] - * - * Every user visible function must have an entry in phar_functions[]. - */ -static const zend_function_entry phar_functions[] = { - PHP_FE_END -}; -/* }}}*/ - static ssize_t phar_zend_stream_reader(void *handle, char *buf, size_t len) /* {{{ */ { return php_stream_read(phar_get_pharfp((phar_archive_data*)handle), buf, len); @@ -3574,7 +3565,7 @@ zend_module_entry phar_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, phar_deps, "Phar", - phar_functions, + NULL, PHP_MINIT(phar), PHP_MSHUTDOWN(phar), NULL, diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 48367c7deb..f11198f27d 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -6381,10 +6381,6 @@ ZEND_METHOD(ReflectionAttribute, newInstance) RETURN_COPY_VALUE(&obj); } -/* }}} */ -static const zend_function_entry reflection_ext_functions[] = { /* {{{ */ - PHP_FE_END -}; /* }}} */ /* {{{ _reflection_write_property */ static zval *_reflection_write_property(zend_object *object, zend_string *name, zval *value, void **cache_slot) @@ -6558,7 +6554,7 @@ PHP_MINFO_FUNCTION(reflection) /* {{{ */ zend_module_entry reflection_module_entry = { /* {{{ */ STANDARD_MODULE_HEADER, "Reflection", - reflection_ext_functions, + NULL, PHP_MINIT(reflection), NULL, NULL, diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index c8d20e0e94..44debcaca7 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -27,15 +27,6 @@ zend_class_entry *xsl_xsltprocessor_class_entry; static zend_object_handlers xsl_object_handlers; -/* {{{ xsl_functions[] - * - * Every user visible function must have an entry in xsl_functions[]. - */ -const zend_function_entry xsl_functions[] = { - PHP_FE_END -}; -/* }}} */ - static const zend_module_dep xsl_deps[] = { ZEND_MOD_REQUIRED("libxml") ZEND_MOD_END @@ -46,7 +37,7 @@ zend_module_entry xsl_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, xsl_deps, "xsl", - xsl_functions, + NULL, PHP_MINIT(xsl), PHP_MSHUTDOWN(xsl), NULL, |