Skip to content

Commit 707a8f7

Browse files
felipenspfelipensp
committed
- Added ZEND_MOD_END macro to use in the end of zend_module_dep[]
1 parent 786d8e7 commit 707a8f7

File tree

22 files changed

+23
-21
lines changed

22 files changed

+23
-21
lines changed

‎Zend/zend_modules.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ struct _zend_module_entry {
113113
#define ZEND_MOD_CONFLICTS(name) ZEND_MOD_CONFLICTS_EX(name, NULL, NULL)
114114
#define ZEND_MOD_OPTIONAL(name) ZEND_MOD_OPTIONAL_EX(name, NULL, NULL)
115115

116+
#define ZEND_MOD_END { NULL, NULL, NULL, 0 }
117+
116118
struct _zend_module_dep {
117119
const char *name; /* module name */
118120
const char *rel; /* version relationship: NULL (exists), lt|le|eq|ge|gt (to given version) */

‎ext/dom/php_dom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ static zend_object_handlers* dom_get_obj_handlers(TSRMLS_D) {
553553
static const zend_module_dep dom_deps[] = {
554554
ZEND_MOD_REQUIRED("libxml")
555555
ZEND_MOD_CONFLICTS("domxml")
556-
{NULL, NULL, NULL}
556+
ZEND_MOD_END
557557
};
558558

559559
zend_module_entry dom_module_entry = { /* {{{ */

‎ext/exif/exif.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ PHP_MSHUTDOWN_FUNCTION(exif)
254254
static const zend_module_dep exif_module_deps[] = {
255255
ZEND_MOD_REQUIRED("standard")
256256
ZEND_MOD_OPTIONAL("mbstring")
257-
{NULL, NULL, NULL}
257+
ZEND_MOD_END
258258
};
259259
/* }}} */
260260

‎ext/imap/php_imap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ const zend_function_entry imap_functions[] = {
558558
/* {{{ imap dependencies */
559559
static const zend_module_dep imap_deps[] = {
560560
ZEND_MOD_REQUIRED("standard")
561-
{NULL, NULL, NULL}
561+
ZEND_MOD_END
562562
};
563563
/* }}} */
564564

‎ext/mysql/php_mysql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ static const zend_module_dep mysql_deps[] = {
329329
#if defined(MYSQL_USE_MYSQLND)
330330
ZEND_MOD_REQUIRED("mysqlnd")
331331
#endif
332-
{NULL, NULL, NULL}
332+
ZEND_MOD_END
333333
};
334334

335335
/* {{{ mysql_module_entry

‎ext/mysqli/mysqli.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ static const zend_module_dep mysqli_deps[] = {
941941
#if defined(MYSQLI_USE_MYSQLND)
942942
ZEND_MOD_REQUIRED("mysqlnd")
943943
#endif
944-
{NULL, NULL, NULL}
944+
ZEND_MOD_END
945945
};
946946

947947
/* {{{ mysqli_module_entry

‎ext/mysqlnd/php_mysqlnd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ static PHP_RSHUTDOWN_FUNCTION(mysqlnd)
312312

313313
static const zend_module_dep mysqlnd_deps[] = {
314314
ZEND_MOD_REQUIRED("standard")
315-
{NULL, NULL, NULL}
315+
ZEND_MOD_END
316316
};
317317

318318
/* {{{ mysqlnd_module_entry

‎ext/pdo/pdo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static const zend_module_dep pdo_deps[] = {
135135
#ifdef HAVE_SPL
136136
ZEND_MOD_REQUIRED("spl")
137137
#endif
138-
{NULL, NULL, NULL}
138+
ZEND_MOD_END
139139
};
140140
#endif
141141
/* }}} */

‎ext/pdo_dblib/pdo_dblib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const zend_function_entry pdo_dblib_functions[] = {
4242
#if ZEND_MODULE_API_NO >= 20050922
4343
static const zend_module_dep pdo_dblib_deps[] = {
4444
ZEND_MOD_REQUIRED("pdo")
45-
{NULL, NULL, NULL}
45+
ZEND_MOD_END
4646
};
4747
#endif
4848

‎ext/pdo_firebird/pdo_firebird.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const zend_function_entry pdo_firebird_functions[] = { /* {{{ */
4040
#if ZEND_MODULE_API_NO >= 20050922
4141
static const zend_module_dep pdo_firebird_deps[] = {
4242
ZEND_MOD_REQUIRED("pdo")
43-
{NULL, NULL, NULL}
43+
ZEND_MOD_END
4444
};
4545
#endif
4646
/* }}} */

‎ext/pdo_mysql/pdo_mysql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static const zend_module_dep pdo_mysql_deps[] = {
181181
#ifdef PDO_USE_MYSQLND
182182
ZEND_MOD_REQUIRED("mysqlnd")
183183
#endif
184-
{NULL, NULL, NULL}
184+
ZEND_MOD_END
185185
};
186186
#endif
187187
/* }}} */

‎ext/pdo_oci/pdo_oci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const zend_function_entry pdo_oci_functions[] = {
4141
#if ZEND_MODULE_API_NO >= 20050922
4242
static const zend_module_dep pdo_oci_deps[] = {
4343
ZEND_MOD_REQUIRED("pdo")
44-
{NULL, NULL, NULL}
44+
ZEND_MOD_END
4545
};
4646
#endif
4747

‎ext/pdo_odbc/pdo_odbc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const zend_function_entry pdo_odbc_functions[] = {
4040
#if ZEND_MODULE_API_NO >= 20050922
4141
static const zend_module_dep pdo_odbc_deps[] = {
4242
ZEND_MOD_REQUIRED("pdo")
43-
{NULL, NULL, NULL}
43+
ZEND_MOD_END
4444
};
4545
#endif
4646
/* }}} */

‎ext/pdo_pgsql/pdo_pgsql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const zend_function_entry pdo_pgsql_functions[] = {
5050
#if ZEND_MODULE_API_NO >= 20050922
5151
static const zend_module_dep pdo_pgsql_deps[] = {
5252
ZEND_MOD_REQUIRED("pdo")
53-
{NULL, NULL, NULL}
53+
ZEND_MOD_END
5454
};
5555
#endif
5656
/* }}} */

‎ext/pdo_sqlite/pdo_sqlite.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const zend_function_entry pdo_sqlite_functions[] = {
4444
#if ZEND_MODULE_API_NO >= 20050922
4545
static const zend_module_dep pdo_sqlite_deps[] = {
4646
ZEND_MOD_REQUIRED("pdo")
47-
{NULL, NULL, NULL}
47+
ZEND_MOD_END
4848
};
4949
#endif
5050
/* }}} */

‎ext/phar/phar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3719,7 +3719,7 @@ static const zend_module_dep phar_deps[] = {
37193719
#if HAVE_SPL
37203720
ZEND_MOD_REQUIRED("spl")
37213721
#endif
3722-
{NULL, NULL, NULL}
3722+
ZEND_MOD_END
37233723
};
37243724

37253725
zend_module_entry phar_module_entry = {

‎ext/session/session.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2075,7 +2075,7 @@ static PHP_MINFO_FUNCTION(session) /* {{{ */
20752075
static const zend_module_dep session_deps[] = { /* {{{ */
20762076
ZEND_MOD_OPTIONAL("hash")
20772077
ZEND_MOD_REQUIRED("spl")
2078-
{NULL, NULL, NULL}
2078+
ZEND_MOD_END
20792079
};
20802080
/* }}} */
20812081

‎ext/simplexml/simplexml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2553,7 +2553,7 @@ const zend_function_entry simplexml_functions[] = { /* {{{ */
25532553
static const zend_module_dep simplexml_deps[] = { /* {{{ */
25542554
ZEND_MOD_REQUIRED("libxml")
25552555
ZEND_MOD_REQUIRED("spl")
2556-
{NULL, NULL, NULL}
2556+
ZEND_MOD_END
25572557
};
25582558
/* }}} */
25592559

‎ext/standard/basic_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3381,7 +3381,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */
33813381

33823382
static const zend_module_dep standard_deps[] = { /* {{{ */
33833383
ZEND_MOD_OPTIONAL("session")
3384-
{NULL, NULL, NULL}
3384+
ZEND_MOD_END
33853385
};
33863386
/* }}} */
33873387

‎ext/xml/xml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ const zend_function_entry xml_functions[] = {
244244
#ifdef LIBXML_EXPAT_COMPAT
245245
static const zend_module_dep xml_deps[] = {
246246
ZEND_MOD_REQUIRED("libxml")
247-
{NULL, NULL, NULL}
247+
ZEND_MOD_END
248248
};
249249
#endif
250250

‎ext/xmlreader/php_xmlreader.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, int source_len, int ty
321321

322322
static const zend_module_dep xmlreader_deps[] = {
323323
ZEND_MOD_REQUIRED("libxml")
324-
{NULL, NULL, NULL}
324+
ZEND_MOD_END
325325
};
326326

327327
/* {{{ xmlreader_module_entry

‎ext/xsl/php_xsl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const zend_function_entry xsl_functions[] = {
4141

4242
static const zend_module_dep xsl_deps[] = {
4343
ZEND_MOD_REQUIRED("libxml")
44-
{NULL, NULL, NULL}
44+
ZEND_MOD_END
4545
};
4646

4747
/* {{{ xsl_module_entry

0 commit comments

Comments
 (0)