- 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 bdbfffac3baec902e9deff26b88058a5f1e880c0..812f656172baa4a06b9b5845e772b11577e4a6bb 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 ad834d8812f4cbdc8445797e6edc7c261ffaed7f..cf9b79ba79a6a0254c9d09c7cfc36e9e61c01a26 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 1b41bd72602d442f328d4a076b3b4960c8f0a91d..bb805302cd3fccfdb15bc3fdbdeda644a849dfde 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -254,7 +254,7 @@ static const zend_module_dep exif_module_deps[] = {
 #if EXIF_USE_MBSTRING
        ZEND_MOD_REQUIRED("mbstring")
 #endif
-       {NULL, NULL, NULL}
+       ZEND_MOD_END
 };
 /* }}} */
 

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 8eb0290ea07618c556362b7ee92bb99e201123e8..22f28b814ebcc013449f689981b65f57ff0a6d7e 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 75c28c399cf5cbc5519033ecc09c0d15e1610e00..57de00f4e2ff39397fb8dd538e7a499dc8c020d5 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 d6ec47deee9334684e8851cacc3808fcc930d168..b2f6ab79d62c7a08b7bf98fab718c27c8e853621 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -939,7 +939,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 1c0c949fc6e70da568d3c3db4771f642618c9f47..bba8d026d9325bd9ef7d70b4f614e61c1140dcca 100644 (file)
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -266,7 +266,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 4065211b43194a13d768267b9a8beb4f16933a6b..cffd4d74f1c00d7963473e518c0c44d1accbcbfc 100755 (executable)
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
@@ -40,7 +40,7 @@ const 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 1c5e6783e545987f886d8ca1e83ed68191b24f18..a5cbab73e36de3f587fc69952690365693da22ca 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3721,7 +3721,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 287ffb073bed02b249460749c869d25e5e1ed0a6..eb679cd3cb3874c75b3c8aaa458080d2f2a03675 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2283,7 +2283,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 f87d8d74ed0c0b5a27bf5ec56fb30a30455c0cf7..9bb9af1a85c6154063a02a7fc04da788563b26e5 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -2523,7 +2523,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 bf58519f8044a16194d47a02ca1ea1e18571bb8e..d1cd20e86e04216de77fdd712040ea6b72bdc11a 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3401,7 +3401,7 @@ PHP_INI_END()
 
 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 7b7f7e5454cd4bd3b6ff255996e467e9a14d26e4..af9e9c9b8e10d39647175dbab0b2f6f2dd2c4443 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -243,7 +243,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 d960bed9172a82c6a92755108a3ee6a5ca65882e..864634c48a6672b738b88c43a0ab63dd21daabb3 100644 (file)
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -320,7 +320,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 445a1d1bc04e2f882e09f95849188f0bd5f3d3a3..8c34b1e986429680697c66560291a2c66fa177c7 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