felipe Sat, 06 Aug 2011 14:47:44 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314376
Log:
- Added ZEND_MOD_END macro to use in the end of zend_module_dep[]
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_modules.h
U php/php-src/branches/PHP_5_3/ext/dom/php_dom.c
U php/php-src/branches/PHP_5_3/ext/exif/exif.c
U php/php-src/branches/PHP_5_3/ext/imap/php_imap.c
U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
U php/php-src/branches/PHP_5_3/ext/pdo/pdo.c
U php/php-src/branches/PHP_5_3/ext/pdo_dblib/pdo_dblib.c
U php/php-src/branches/PHP_5_3/ext/pdo_firebird/pdo_firebird.c
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c
U php/php-src/branches/PHP_5_3/ext/pdo_oci/pdo_oci.c
U php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c
U php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pdo_pgsql.c
U php/php-src/branches/PHP_5_3/ext/pdo_sqlite/pdo_sqlite.c
U php/php-src/branches/PHP_5_3/ext/phar/phar.c
U php/php-src/branches/PHP_5_3/ext/session/session.c
U php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c
U php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U php/php-src/branches/PHP_5_3/ext/xml/xml.c
U php/php-src/branches/PHP_5_3/ext/xmlreader/php_xmlreader.c
U php/php-src/branches/PHP_5_3/ext/xsl/php_xsl.c
U php/php-src/branches/PHP_5_4/Zend/zend_modules.h
U php/php-src/branches/PHP_5_4/ext/dom/php_dom.c
U php/php-src/branches/PHP_5_4/ext/exif/exif.c
U php/php-src/branches/PHP_5_4/ext/imap/php_imap.c
U php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c
U php/php-src/branches/PHP_5_4/ext/pdo/pdo.c
U php/php-src/branches/PHP_5_4/ext/pdo_dblib/pdo_dblib.c
U php/php-src/branches/PHP_5_4/ext/pdo_firebird/pdo_firebird.c
U php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c
U php/php-src/branches/PHP_5_4/ext/pdo_oci/pdo_oci.c
U php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c
U php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pdo_pgsql.c
U php/php-src/branches/PHP_5_4/ext/pdo_sqlite/pdo_sqlite.c
U php/php-src/branches/PHP_5_4/ext/phar/phar.c
U php/php-src/branches/PHP_5_4/ext/session/session.c
U php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c
U php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
U php/php-src/branches/PHP_5_4/ext/xml/xml.c
U php/php-src/branches/PHP_5_4/ext/xmlreader/php_xmlreader.c
U php/php-src/branches/PHP_5_4/ext/xsl/php_xsl.c
U php/php-src/trunk/Zend/zend_modules.h
U php/php-src/trunk/ext/dom/php_dom.c
U php/php-src/trunk/ext/exif/exif.c
U php/php-src/trunk/ext/imap/php_imap.c
U php/php-src/trunk/ext/mysql/php_mysql.c
U php/php-src/trunk/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
U php/php-src/trunk/ext/pdo/pdo.c
U php/php-src/trunk/ext/pdo_dblib/pdo_dblib.c
U php/php-src/trunk/ext/pdo_firebird/pdo_firebird.c
U php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c
U php/php-src/trunk/ext/pdo_oci/pdo_oci.c
U php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c
U php/php-src/trunk/ext/pdo_pgsql/pdo_pgsql.c
U php/php-src/trunk/ext/pdo_sqlite/pdo_sqlite.c
U php/php-src/trunk/ext/phar/phar.c
U php/php-src/trunk/ext/session/session.c
U php/php-src/trunk/ext/simplexml/simplexml.c
U php/php-src/trunk/ext/standard/basic_functions.c
U php/php-src/trunk/ext/xml/xml.c
U php/php-src/trunk/ext/xmlreader/php_xmlreader.c
U php/php-src/trunk/ext/xsl/php_xsl.c
Modified: php/php-src/branches/PHP_5_3/Zend/zend_modules.h
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_modules.h 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/Zend/zend_modules.h 2011-08-06 14:47:44 UTC (rev 314376)
@@ -113,6 +113,8 @@
#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) */
Modified: php/php-src/branches/PHP_5_3/ext/dom/php_dom.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/dom/php_dom.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/dom/php_dom.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -553,7 +553,7 @@
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 = { /* {{{ */
Modified: php/php-src/branches/PHP_5_3/ext/exif/exif.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/exif/exif.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/exif/exif.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -254,7 +254,7 @@
#if EXIF_USE_MBSTRING
ZEND_MOD_REQUIRED("mbstring")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/imap/php_imap.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/imap/php_imap.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/imap/php_imap.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -558,7 +558,7 @@
/* {{{ imap dependencies */
static const zend_module_dep imap_deps[] = {
ZEND_MOD_REQUIRED("standard")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -329,7 +329,7 @@
#if defined(MYSQL_USE_MYSQLND)
ZEND_MOD_REQUIRED("mysqlnd")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ mysql_module_entry
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -939,7 +939,7 @@
#if defined(MYSQLI_USE_MYSQLND)
ZEND_MOD_REQUIRED("mysqlnd")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ mysqli_module_entry
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -266,7 +266,7 @@
static const zend_module_dep mysqlnd_deps[] = {
ZEND_MOD_REQUIRED("standard")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ mysqlnd_module_entry
Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -135,7 +135,7 @@
#ifdef HAVE_SPL
ZEND_MOD_REQUIRED("spl")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
#endif
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/pdo_dblib/pdo_dblib.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_dblib/pdo_dblib.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/pdo_dblib/pdo_dblib.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -42,7 +42,7 @@
#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
Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/pdo_firebird.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_firebird/pdo_firebird.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/pdo_firebird.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -40,7 +40,7 @@
#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
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -181,7 +181,7 @@
#ifdef PDO_USE_MYSQLND
ZEND_MOD_REQUIRED("mysqlnd")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
#endif
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/pdo_oci.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_oci/pdo_oci.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/pdo_oci/pdo_oci.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -41,7 +41,7 @@
#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
Modified: php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -40,7 +40,7 @@
#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
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pdo_pgsql.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pdo_pgsql.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pdo_pgsql.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -50,7 +50,7 @@
#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
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/pdo_sqlite/pdo_sqlite.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_sqlite/pdo_sqlite.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/pdo_sqlite/pdo_sqlite.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -44,7 +44,7 @@
#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
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/phar/phar.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/phar.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -3721,7 +3721,7 @@
#if HAVE_SPL
ZEND_MOD_REQUIRED("spl")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
zend_module_entry phar_module_entry = {
Modified: php/php-src/branches/PHP_5_3/ext/session/session.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/session.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/session/session.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -2283,7 +2283,7 @@
static const zend_module_dep session_deps[] = { /* {{{ */
ZEND_MOD_OPTIONAL("hash")
ZEND_MOD_REQUIRED("spl")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -2523,7 +2523,7 @@
static const zend_module_dep simplexml_deps[] = { /* {{{ */
ZEND_MOD_REQUIRED("libxml")
ZEND_MOD_REQUIRED("spl")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -3401,7 +3401,7 @@
static const zend_module_dep standard_deps[] = { /* {{{ */
ZEND_MOD_OPTIONAL("session")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/xml/xml.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/xml/xml.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/xml/xml.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -243,7 +243,7 @@
#ifdef LIBXML_EXPAT_COMPAT
static const zend_module_dep xml_deps[] = {
ZEND_MOD_REQUIRED("libxml")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
#endif
Modified: php/php-src/branches/PHP_5_3/ext/xmlreader/php_xmlreader.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/xmlreader/php_xmlreader.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/xmlreader/php_xmlreader.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -320,7 +320,7 @@
static const zend_module_dep xmlreader_deps[] = {
ZEND_MOD_REQUIRED("libxml")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ xmlreader_module_entry
Modified: php/php-src/branches/PHP_5_3/ext/xsl/php_xsl.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/xsl/php_xsl.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_3/ext/xsl/php_xsl.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -41,7 +41,7 @@
static const zend_module_dep xsl_deps[] = {
ZEND_MOD_REQUIRED("libxml")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ xsl_module_entry
Modified: php/php-src/branches/PHP_5_4/Zend/zend_modules.h
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_modules.h 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/Zend/zend_modules.h 2011-08-06 14:47:44 UTC (rev 314376)
@@ -113,6 +113,8 @@
#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) */
Modified: php/php-src/branches/PHP_5_4/ext/dom/php_dom.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/dom/php_dom.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/dom/php_dom.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -553,7 +553,7 @@
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 = { /* {{{ */
Modified: php/php-src/branches/PHP_5_4/ext/exif/exif.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/exif/exif.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/exif/exif.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -254,7 +254,7 @@
static const zend_module_dep exif_module_deps[] = {
ZEND_MOD_REQUIRED("standard")
ZEND_MOD_OPTIONAL("mbstring")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/imap/php_imap.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/imap/php_imap.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/imap/php_imap.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -558,7 +558,7 @@
/* {{{ imap dependencies */
static const zend_module_dep imap_deps[] = {
ZEND_MOD_REQUIRED("standard")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -329,7 +329,7 @@
#if defined(MYSQL_USE_MYSQLND)
ZEND_MOD_REQUIRED("mysqlnd")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ mysql_module_entry
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -941,7 +941,7 @@
#if defined(MYSQLI_USE_MYSQLND)
ZEND_MOD_REQUIRED("mysqlnd")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ mysqli_module_entry
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -312,7 +312,7 @@
static const zend_module_dep mysqlnd_deps[] = {
ZEND_MOD_REQUIRED("standard")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ mysqlnd_module_entry
Modified: php/php-src/branches/PHP_5_4/ext/pdo/pdo.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo/pdo.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/pdo/pdo.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -135,7 +135,7 @@
#ifdef HAVE_SPL
ZEND_MOD_REQUIRED("spl")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
#endif
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/pdo_dblib/pdo_dblib.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_dblib/pdo_dblib.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/pdo_dblib/pdo_dblib.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -42,7 +42,7 @@
#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
Modified: php/php-src/branches/PHP_5_4/ext/pdo_firebird/pdo_firebird.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_firebird/pdo_firebird.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/pdo_firebird/pdo_firebird.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -40,7 +40,7 @@
#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
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -181,7 +181,7 @@
#ifdef PDO_USE_MYSQLND
ZEND_MOD_REQUIRED("mysqlnd")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
#endif
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/pdo_oci/pdo_oci.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_oci/pdo_oci.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/pdo_oci/pdo_oci.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -41,7 +41,7 @@
#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
Modified: php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -40,7 +40,7 @@
#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
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pdo_pgsql.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pdo_pgsql.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pdo_pgsql.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -50,7 +50,7 @@
#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
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/pdo_sqlite/pdo_sqlite.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_sqlite/pdo_sqlite.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/pdo_sqlite/pdo_sqlite.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -44,7 +44,7 @@
#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
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/phar/phar.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/phar/phar.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/phar/phar.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -3719,7 +3719,7 @@
#if HAVE_SPL
ZEND_MOD_REQUIRED("spl")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
zend_module_entry phar_module_entry = {
Modified: php/php-src/branches/PHP_5_4/ext/session/session.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/session.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/session/session.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -2075,7 +2075,7 @@
static const zend_module_dep session_deps[] = { /* {{{ */
ZEND_MOD_OPTIONAL("hash")
ZEND_MOD_REQUIRED("spl")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -2553,7 +2553,7 @@
static const zend_module_dep simplexml_deps[] = { /* {{{ */
ZEND_MOD_REQUIRED("libxml")
ZEND_MOD_REQUIRED("spl")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -3381,7 +3381,7 @@
static const zend_module_dep standard_deps[] = { /* {{{ */
ZEND_MOD_OPTIONAL("session")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/xml/xml.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/xml/xml.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/xml/xml.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -244,7 +244,7 @@
#ifdef LIBXML_EXPAT_COMPAT
static const zend_module_dep xml_deps[] = {
ZEND_MOD_REQUIRED("libxml")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
#endif
Modified: php/php-src/branches/PHP_5_4/ext/xmlreader/php_xmlreader.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/xmlreader/php_xmlreader.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/xmlreader/php_xmlreader.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -321,7 +321,7 @@
static const zend_module_dep xmlreader_deps[] = {
ZEND_MOD_REQUIRED("libxml")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ xmlreader_module_entry
Modified: php/php-src/branches/PHP_5_4/ext/xsl/php_xsl.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/xsl/php_xsl.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/branches/PHP_5_4/ext/xsl/php_xsl.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -41,7 +41,7 @@
static const zend_module_dep xsl_deps[] = {
ZEND_MOD_REQUIRED("libxml")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ xsl_module_entry
Modified: php/php-src/trunk/Zend/zend_modules.h
===================================================================
--- php/php-src/trunk/Zend/zend_modules.h 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/Zend/zend_modules.h 2011-08-06 14:47:44 UTC (rev 314376)
@@ -113,6 +113,8 @@
#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) */
Modified: php/php-src/trunk/ext/dom/php_dom.c
===================================================================
--- php/php-src/trunk/ext/dom/php_dom.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/dom/php_dom.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -553,7 +553,7 @@
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 = { /* {{{ */
Modified: php/php-src/trunk/ext/exif/exif.c
===================================================================
--- php/php-src/trunk/ext/exif/exif.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/exif/exif.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -254,7 +254,7 @@
static const zend_module_dep exif_module_deps[] = {
ZEND_MOD_REQUIRED("standard")
ZEND_MOD_OPTIONAL("mbstring")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/trunk/ext/imap/php_imap.c
===================================================================
--- php/php-src/trunk/ext/imap/php_imap.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/imap/php_imap.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -558,7 +558,7 @@
/* {{{ imap dependencies */
static const zend_module_dep imap_deps[] = {
ZEND_MOD_REQUIRED("standard")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/trunk/ext/mysql/php_mysql.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -329,7 +329,7 @@
#if defined(MYSQL_USE_MYSQLND)
ZEND_MOD_REQUIRED("mysqlnd")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ mysql_module_entry
Modified: php/php-src/trunk/ext/mysqli/mysqli.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/mysqli/mysqli.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -941,7 +941,7 @@
#if defined(MYSQLI_USE_MYSQLND)
ZEND_MOD_REQUIRED("mysqlnd")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ mysqli_module_entry
Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -312,7 +312,7 @@
static const zend_module_dep mysqlnd_deps[] = {
ZEND_MOD_REQUIRED("standard")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ mysqlnd_module_entry
Modified: php/php-src/trunk/ext/pdo/pdo.c
===================================================================
--- php/php-src/trunk/ext/pdo/pdo.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/pdo/pdo.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -135,7 +135,7 @@
#ifdef HAVE_SPL
ZEND_MOD_REQUIRED("spl")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
#endif
/* }}} */
Modified: php/php-src/trunk/ext/pdo_dblib/pdo_dblib.c
===================================================================
--- php/php-src/trunk/ext/pdo_dblib/pdo_dblib.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/pdo_dblib/pdo_dblib.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -42,7 +42,7 @@
#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
Modified: php/php-src/trunk/ext/pdo_firebird/pdo_firebird.c
===================================================================
--- php/php-src/trunk/ext/pdo_firebird/pdo_firebird.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/pdo_firebird/pdo_firebird.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -40,7 +40,7 @@
#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
/* }}} */
Modified: php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -181,7 +181,7 @@
#ifdef PDO_USE_MYSQLND
ZEND_MOD_REQUIRED("mysqlnd")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
#endif
/* }}} */
Modified: php/php-src/trunk/ext/pdo_oci/pdo_oci.c
===================================================================
--- php/php-src/trunk/ext/pdo_oci/pdo_oci.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/pdo_oci/pdo_oci.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -41,7 +41,7 @@
#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
Modified: php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c
===================================================================
--- php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -40,7 +40,7 @@
#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
/* }}} */
Modified: php/php-src/trunk/ext/pdo_pgsql/pdo_pgsql.c
===================================================================
--- php/php-src/trunk/ext/pdo_pgsql/pdo_pgsql.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/pdo_pgsql/pdo_pgsql.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -50,7 +50,7 @@
#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
/* }}} */
Modified: php/php-src/trunk/ext/pdo_sqlite/pdo_sqlite.c
===================================================================
--- php/php-src/trunk/ext/pdo_sqlite/pdo_sqlite.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/pdo_sqlite/pdo_sqlite.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -44,7 +44,7 @@
#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
/* }}} */
Modified: php/php-src/trunk/ext/phar/phar.c
===================================================================
--- php/php-src/trunk/ext/phar/phar.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/phar/phar.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -3719,7 +3719,7 @@
#if HAVE_SPL
ZEND_MOD_REQUIRED("spl")
#endif
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
zend_module_entry phar_module_entry = {
Modified: php/php-src/trunk/ext/session/session.c
===================================================================
--- php/php-src/trunk/ext/session/session.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/session/session.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -2075,7 +2075,7 @@
static const zend_module_dep session_deps[] = { /* {{{ */
ZEND_MOD_OPTIONAL("hash")
ZEND_MOD_REQUIRED("spl")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/trunk/ext/simplexml/simplexml.c
===================================================================
--- php/php-src/trunk/ext/simplexml/simplexml.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/simplexml/simplexml.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -2553,7 +2553,7 @@
static const zend_module_dep simplexml_deps[] = { /* {{{ */
ZEND_MOD_REQUIRED("libxml")
ZEND_MOD_REQUIRED("spl")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/standard/basic_functions.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -3383,7 +3383,7 @@
static const zend_module_dep standard_deps[] = { /* {{{ */
ZEND_MOD_OPTIONAL("session")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* }}} */
Modified: php/php-src/trunk/ext/xml/xml.c
===================================================================
--- php/php-src/trunk/ext/xml/xml.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/xml/xml.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -244,7 +244,7 @@
#ifdef LIBXML_EXPAT_COMPAT
static const zend_module_dep xml_deps[] = {
ZEND_MOD_REQUIRED("libxml")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
#endif
Modified: php/php-src/trunk/ext/xmlreader/php_xmlreader.c
===================================================================
--- php/php-src/trunk/ext/xmlreader/php_xmlreader.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/xmlreader/php_xmlreader.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -321,7 +321,7 @@
static const zend_module_dep xmlreader_deps[] = {
ZEND_MOD_REQUIRED("libxml")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ xmlreader_module_entry
Modified: php/php-src/trunk/ext/xsl/php_xsl.c
===================================================================
--- php/php-src/trunk/ext/xsl/php_xsl.c 2011-08-06 13:58:39 UTC (rev 314375)
+++ php/php-src/trunk/ext/xsl/php_xsl.c 2011-08-06 14:47:44 UTC (rev 314376)
@@ -41,7 +41,7 @@
static const zend_module_dep xsl_deps[] = {
ZEND_MOD_REQUIRED("libxml")
- {NULL, NULL, NULL}
+ ZEND_MOD_END
};
/* {{{ xsl_module_entry
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
