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

15 years ago · 9480eace41
22 changed files with 23 additions and 21 deletions
--- 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) */
--- 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 = { /* {{{ */
--- 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
 };
 /* }}} */

--- 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
 };
 /* }}} */

--- 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
--- 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
--- 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
--- 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
 /* }}} */
--- 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

--- 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
 /* }}} */
--- 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
 /* }}} */
--- 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

--- 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
 /* }}} */
--- 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
 /* }}} */
--- 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
 /* }}} */
--- 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 = {
--- 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
 };
 /* }}} */

--- 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
 };
 /* }}} */

--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@ -3383,7 +3383,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */

 static const zend_module_dep standard_deps[] = { /* {{{ */
 	ZEND_MOD_OPTIONAL("session")
-	{NULL, NULL, NULL}
+	ZEND_MOD_END
 };
 /* }}} */

--- 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

--- 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
--- 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