- Added ZEND_MOD_END macro to use in the end of zend_module_dep[]

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index e27677b7ef82718824b43f3997506ddcd92c43e3..1a2051cf69597fed2f29b3ddeb3eede45b8d111a 100644 (file)
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -113,6 +113,8 @@ struct _zend_module_entry {
 #define ZEND_MOD_CONFLICTS(name)       ZEND_MOD_CONFLICTS_EX(name, NULL, NULL)
 #define ZEND_MOD_OPTIONAL(name)                ZEND_MOD_OPTIONAL_EX(name, NULL, NULL)
 
+#define ZEND_MOD_END { NULL, NULL, NULL, 0 }
+
 struct _zend_module_dep {
        const char *name;               /* module name */
        const char *rel;                /* version relationship: NULL (exists), lt|le|eq|ge|gt (to given version) */

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index d92e9449de868a2dfdc7981fc3647084decc89b1..afbf1b9062b99df985f59515690ce47d281f2b90 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -553,7 +553,7 @@ static zend_object_handlers* dom_get_obj_handlers(TSRMLS_D) {
 static const zend_module_dep dom_deps[] = {
        ZEND_MOD_REQUIRED("libxml")
        ZEND_MOD_CONFLICTS("domxml")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 
 zend_module_entry dom_module_entry = { /* {{{ */

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index d7d19eff8eb7c6bf83bcf2065ebf3aa703a76be4..7d7a2a4645dec6f31dc6ef1f8fb4747fbe04ff09 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -254,7 +254,7 @@ PHP_MSHUTDOWN_FUNCTION(exif)
 static const zend_module_dep exif_module_deps[] = {
        ZEND_MOD_REQUIRED("standard")
        ZEND_MOD_OPTIONAL("mbstring")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 /* }}} */
 

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index a0b52ed243db8c8060811162457665d3ac81f981..90e330d9ac80e92cc325227df5a1ddbe26466af7 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -558,7 +558,7 @@ const zend_function_entry imap_functions[] = {
 /* {{{ imap dependencies */
 static const zend_module_dep imap_deps[] = {
        ZEND_MOD_REQUIRED("standard")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 /* }}} */
 

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index f6fd05eb91cee426b7aa4003bfbe53ad61eaf9d7..8a0d5434cfbbdc878463316691ad1121bcce8305 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -329,7 +329,7 @@ static const zend_module_dep mysql_deps[] = {
 #if defined(MYSQL_USE_MYSQLND)
        ZEND_MOD_REQUIRED("mysqlnd")
 #endif
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 
 /* {{{ mysql_module_entry

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index fc35c8302e9435ed6fca916b465f13259b1a6303..4ba13f51166394e816b2a94b19a3c5bcb017ee31 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -941,7 +941,7 @@ static const  zend_module_dep mysqli_deps[] = {
 #if defined(MYSQLI_USE_MYSQLND)
        ZEND_MOD_REQUIRED("mysqlnd")
 #endif
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 
 /* {{{ mysqli_module_entry

diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index 1c744cea68317f5d8918dd3ce4c59ee26044b9f7..5682bdeef86b35840f169f1ca56c71d38cd4acb2 100644 (file)
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -312,7 +312,7 @@ static PHP_RSHUTDOWN_FUNCTION(mysqlnd)
 
 static const zend_module_dep mysqlnd_deps[] = {
        ZEND_MOD_REQUIRED("standard")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 
 /* {{{ mysqlnd_module_entry

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 1604d51858fa4b77c469c9e3e51663be8fd23311..169ce32e25fe990e4cd62f02620836c006f55711 100755 (executable)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -135,7 +135,7 @@ static const zend_module_dep pdo_deps[] = {
 #ifdef HAVE_SPL
        ZEND_MOD_REQUIRED("spl")
 #endif
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 #endif
 /* }}} */

diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c
index 278c1985a1c014350c9f7a577fdb364136e30eac..17bc8f86aa45e437d37c4dae8356abad3f19e49e 100644 (file)
--- a/ext/pdo_dblib/pdo_dblib.c
+++ b/ext/pdo_dblib/pdo_dblib.c
@@ -42,7 +42,7 @@ const zend_function_entry pdo_dblib_functions[] = {
 #if ZEND_MODULE_API_NO >= 20050922
 static const zend_module_dep pdo_dblib_deps[] = {
        ZEND_MOD_REQUIRED("pdo")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 #endif
 

diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c
index 6459c70364d0d98a36e6b6b2f82f0503b64aa1ad..4f04f939fc264664258ac2fc1dc7076f71cee2ea 100644 (file)
--- a/ext/pdo_firebird/pdo_firebird.c
+++ b/ext/pdo_firebird/pdo_firebird.c
@@ -40,7 +40,7 @@ const zend_function_entry pdo_firebird_functions[] = { /* {{{ */
 #if ZEND_MODULE_API_NO >= 20050922
 static const zend_module_dep pdo_firebird_deps[] = {
        ZEND_MOD_REQUIRED("pdo")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 #endif
 /* }}} */

diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 5fdab6ba942b75562a0911e8b8ccbacb6e18ae9b..97cce4a1de05df6c6175d7d4952d81aa1f34ceb0 100755 (executable)
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -181,7 +181,7 @@ static const zend_module_dep pdo_mysql_deps[] = {
 #ifdef PDO_USE_MYSQLND
        ZEND_MOD_REQUIRED("mysqlnd")
 #endif
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 #endif
 /* }}} */

diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c
index 78539761b7018809fd8324f2e681b6a013f12f25..9182cf3bf4226a2ecfabd1b937e3d6fafd552c2f 100755 (executable)
--- a/ext/pdo_oci/pdo_oci.c
+++ b/ext/pdo_oci/pdo_oci.c
@@ -41,7 +41,7 @@ const zend_function_entry pdo_oci_functions[] = {
 #if ZEND_MODULE_API_NO >= 20050922
 static const zend_module_dep pdo_oci_deps[] = {
        ZEND_MOD_REQUIRED("pdo")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 #endif
 

diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c
index bc71aada53c9a35e44a06133863d3ee71e26812e..7a021e61a716cb7a3fcbb4fc4d62c9a84c227290 100755 (executable)
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
@@ -40,7 +40,7 @@ const zend_function_entry pdo_odbc_functions[] = {
 #if ZEND_MODULE_API_NO >= 20050922
 static const zend_module_dep pdo_odbc_deps[] = {
        ZEND_MOD_REQUIRED("pdo")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 #endif
 /* }}} */

diff --git a/ext/pdo_pgsql/pdo_pgsql.c b/ext/pdo_pgsql/pdo_pgsql.c
index 805d752afc517959a49ba69c0f1baa09ef7e879f..b30a7a4f47c8c6ad9e4d813f568b8a1fb832324a 100644 (file)
--- a/ext/pdo_pgsql/pdo_pgsql.c
+++ b/ext/pdo_pgsql/pdo_pgsql.c
@@ -50,7 +50,7 @@ const zend_function_entry pdo_pgsql_functions[] = {
 #if ZEND_MODULE_API_NO >= 20050922
 static const zend_module_dep pdo_pgsql_deps[] = {
        ZEND_MOD_REQUIRED("pdo")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 #endif
 /* }}} */

diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c
index c9a514a41bd84412c98bb31ec93f917492703ef1..ab3ec3f6cd902adabb6ee1ac21110e7256ce10b1 100644 (file)
--- a/ext/pdo_sqlite/pdo_sqlite.c
+++ b/ext/pdo_sqlite/pdo_sqlite.c
@@ -44,7 +44,7 @@ const zend_function_entry pdo_sqlite_functions[] = {
 #if ZEND_MODULE_API_NO >= 20050922
 static const zend_module_dep pdo_sqlite_deps[] = {
        ZEND_MOD_REQUIRED("pdo")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 #endif
 /* }}} */

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index c31fd7d070967a96331ff409962c4d4daadc4918..70ca17fb42d610128511d38dcd09a1fe118c8328 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3719,7 +3719,7 @@ static const zend_module_dep phar_deps[] = {
 #if HAVE_SPL
        ZEND_MOD_REQUIRED("spl")
 #endif
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 
 zend_module_entry phar_module_entry = {

diff --git a/ext/session/session.c b/ext/session/session.c
index 16528e2d731c5b87fa656dd885b508b76119d2af..bc3b3487a08a7842babe8a192f8383868b865245 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2075,7 +2075,7 @@ static PHP_MINFO_FUNCTION(session) /* {{{ */
 static const zend_module_dep session_deps[] = { /* {{{ */
        ZEND_MOD_OPTIONAL("hash")
        ZEND_MOD_REQUIRED("spl")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 /* }}} */
 

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 6f4e3661089936eb20a08c94ba29239381b42626..c7bada57c40ea360f12b4a36b3ef4422a7d36616 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -2553,7 +2553,7 @@ const zend_function_entry simplexml_functions[] = { /* {{{ */
 static const zend_module_dep simplexml_deps[] = { /* {{{ */
        ZEND_MOD_REQUIRED("libxml")
        ZEND_MOD_REQUIRED("spl")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 /* }}} */
 

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index cafc633a8aaed56742559a149a1ce9a7421d4e39..ba83eb38d8734b2f6e07c0e4bdb15df22624dc0f 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3381,7 +3381,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */
 
 static const zend_module_dep standard_deps[] = { /* {{{ */
        ZEND_MOD_OPTIONAL("session")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 /* }}} */
 

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index d7d2d7df4134381b10fbf034e01b910390dddd4e..6788c86bc34d8295f97966e55560fdf25697ebbe 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -244,7 +244,7 @@ const zend_function_entry xml_functions[] = {
 #ifdef LIBXML_EXPAT_COMPAT
 static const zend_module_dep xml_deps[] = {
        ZEND_MOD_REQUIRED("libxml")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 #endif
 

diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index f875896026ef9f458c8462439ee258e8f3b7601a..c1f1712efe8646b35058afb9c77bc65b6e497c72 100644 (file)
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -321,7 +321,7 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, int source_len, int ty
 
 static const zend_module_dep xmlreader_deps[] = {
        ZEND_MOD_REQUIRED("libxml")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 
 /* {{{ xmlreader_module_entry

diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c
index 896c28596c1f9d6d7ffc1da1cf289636f0bd8cb6..f8d2519defad11a6ce624e13e3e8a8ee3433048e 100644 (file)
--- a/ext/xsl/php_xsl.c
+++ b/ext/xsl/php_xsl.c
@@ -41,7 +41,7 @@ const zend_function_entry xsl_functions[] = {
 
 static const zend_module_dep xsl_deps[] = {
        ZEND_MOD_REQUIRED("libxml")
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 
 /* {{{ xsl_module_entry