cvs: php-src /ext/spl php_spl.c /ext/sqlite sqlite.c /ext/xmlreader php_xmlreader.c

sniper Fri Jun 17 12:42:54 2005 EDT Modified files: /php-src/ext/spl php_spl.c /php-src/ext/sqlite sqlite.c /php-src/ext/xmlreader php_xmlreader.c Log: Use the new dependency system http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.48&r2=1.49&ty=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.48 php-src/ext/spl/php_spl.c:1.49 --- php-src/ext/spl/php_spl.c:1.48 Thu May 12 17:23:56 2005 +++ php-src/ext/spl/php_spl.c Fri Jun 17 12:42:53 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.48 2005/05/12 21:23:56 helly Exp $ */ +/* $Id: php_spl.c,v 1.49 2005/06/17 16:42:53 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -581,10 +581,23 @@ return SUCCESS; } /* }}} */ +#ifdef HAVE_SIMPLEXML +static zend_module_dep spl_deps[] = { + ZEND_MOD_REQUIRED("libxml") + ZEND_MOD_REQUIRED("simplexml") + {NULL, NULL, NULL} +}; +#endif + /* {{{ spl_module_entry */ zend_module_entry spl_module_entry = { +#ifdef HAVE_SIMPLEXML + STANDARD_MODULE_HEADER_EX, NULL, + spl_deps, +#else STANDARD_MODULE_HEADER, +#endif "SPL", spl_functions, PHP_MINIT(spl), http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.164&r2=1.165&ty=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.164 php-src/ext/sqlite/sqlite.c:1.165 --- php-src/ext/sqlite/sqlite.c:1.164 Fri Jun 17 05:39:20 2005 +++ php-src/ext/sqlite/sqlite.c Fri Jun 17 12:42:53 2005 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.164 2005/06/17 09:39:20 dmitry Exp $ + $Id: sqlite.c,v 1.165 2005/06/17 16:42:53 sniper Exp $ */ #ifdef HAVE_CONFIG_H @@ -275,7 +275,7 @@ #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ZEND_MOD_REQUIRED("session") #endif -#if PHP_SQLITE2_HAVE_PDO +#ifdef PHP_SQLITE2_HAVE_PDO ZEND_MOD_REQUIRED("pdo") #endif {NULL, NULL, NULL} @@ -1096,7 +1096,7 @@ REGISTER_LONG_CONSTANT("SQLITE_ROW", SQLITE_ROW, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SQLITE_DONE", SQLITE_DONE, CONST_CS|CONST_PERSISTENT); -#if PHP_SQLITE2_HAVE_PDO +#ifdef PHP_SQLITE2_HAVE_PDO if (FAILURE == php_pdo_register_driver(&pdo_sqlite2_driver)) { return FAILURE; } @@ -1109,7 +1109,7 @@ { UNREGISTER_INI_ENTRIES(); -#if PHP_SQLITE2_HAVE_PDO +#ifdef PHP_SQLITE2_HAVE_PDO php_pdo_unregister_driver(&pdo_sqlite2_driver); #endif @@ -1125,7 +1125,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.164 2005/06/17 09:39:20 dmitry Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.165 2005/06/17 16:42:53 sniper Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); http://cvs.php.net/diff.php/php-src/ext/xmlreader/php_xmlreader.c?r1=1.11&r2=1.12&ty=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.11 php-src/ext/xmlreader/php_xmlreader.c:1.12 --- php-src/ext/xmlreader/php_xmlreader.c:1.11 Sun Apr 17 22:43:42 2005 +++ php-src/ext/xmlreader/php_xmlreader.c Fri Jun 17 12:42:54 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.11 2005/04/18 02:43:42 iliaa Exp $ */ +/* $Id: php_xmlreader.c,v 1.12 2005/06/17 16:42:54 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -276,10 +276,16 @@ } #endif +static zend_module_dep xmlreader_deps[] = { + ZEND_MOD_REQUIRED("libxml") + {NULL, NULL, NULL} +}; + /* {{{ xmlreader_module_entry */ zend_module_entry xmlreader_module_entry = { - STANDARD_MODULE_HEADER, + STANDARD_MODULE_HEADER_EX, NULL, + xmlreader_deps, "xmlreader", NULL, PHP_MINIT(xmlreader),