diff options
92 files changed, 308 insertions, 36 deletions
diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c index 63ae1b662b..947ace77de 100644 --- a/ext/aspell/aspell.c +++ b/ext/aspell/aspell.c @@ -51,7 +51,8 @@ function_entry aspell_functions[] = { static int le_aspell; zend_module_entry aspell_module_entry = { - "aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_ASPELL diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index 55b3af35bf..b79756f311 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -44,6 +44,7 @@ function_entry bcmath_functions[] = { }; zend_module_entry bcmath_module_entry = { + STANDARD_MODULE_HEADER, "bcmath", bcmath_functions, PHP_MINIT(bcmath), @@ -51,6 +52,7 @@ zend_module_entry bcmath_module_entry = { PHP_RINIT(bcmath), NULL, PHP_MINFO(bcmath), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index 5fafa8de32..1ef0ec5f0a 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -57,6 +57,7 @@ function_entry calendar_functions[] = { zend_module_entry calendar_module_entry = { + STANDARD_MODULE_HEADER, "calendar", calendar_functions, PHP_MINIT(calendar), @@ -64,6 +65,7 @@ zend_module_entry calendar_module_entry = { NULL, NULL, PHP_MINFO(calendar), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES, }; diff --git a/ext/ccvs/ccvs.c b/ext/ccvs/ccvs.c index 10c2686244..2e2d94b75f 100644 --- a/ext/ccvs/ccvs.c +++ b/ext/ccvs/ccvs.c @@ -97,15 +97,17 @@ static char const cvsid[] = "$Id$"; /* Declare our module to the Zend engine */ zend_module_entry ccvs_module_entry = { + STANDARD_MODULE_HEADER, "CCVS", ccvs_functions, NULL, NULL, NULL, NULL, PHP_MINFO(ccvs), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; -#ifdef COMPILE_DL_LDAP -ZEND_GET_MODULE(ldap) +#ifdef COMPILE_DL_CCVS +ZEND_GET_MODULE(ccvs) #endif /* Full Functions (The actual CCVS functions and any internal php hooked functions such as MINFO) */ diff --git a/ext/com/COM.c b/ext/com/COM.c index a8b49f7d59..52b085a7a7 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -1681,7 +1681,16 @@ PHP_MSHUTDOWN_FUNCTION(COM) /* exports for external object creation */ zend_module_entry COM_module_entry = { - "com", COM_functions, PHP_MINIT(COM), PHP_MSHUTDOWN(COM), NULL, NULL, PHP_MINFO(COM), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "com", + COM_functions, + PHP_MINIT(COM), + PHP_MSHUTDOWN(COM), + NULL, + NULL, + PHP_MINFO(COM), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; PHPAPI int php_COM_get_le_comval() @@ -1690,3 +1699,11 @@ PHPAPI int php_COM_get_le_comval() } #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + */ diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c index 9bb9aef50c..7c8f25af16 100644 --- a/ext/cpdf/cpdf.c +++ b/ext/cpdf/cpdf.c @@ -155,7 +155,16 @@ function_entry cpdf_functions[] = { }; zend_module_entry cpdf_module_entry = { - "cpdf", cpdf_functions, PHP_MINIT(cpdf), PHP_MSHUTDOWN(cpdf), PHP_RINIT(cpdf), NULL, PHP_MINFO(cpdf), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "cpdf", + cpdf_functions, + PHP_MINIT(cpdf), + PHP_MSHUTDOWN(cpdf), + PHP_RINIT(cpdf), + NULL, + PHP_MINFO(cpdf), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_CPDF diff --git a/ext/crack/crack.c b/ext/crack/crack.c index fbadc257df..5663479649 100644 --- a/ext/crack/crack.c +++ b/ext/crack/crack.c @@ -43,6 +43,7 @@ function_entry crack_functions[] = { }; zend_module_entry crack_module_entry = { + STANDARD_MODULE_HEADER, "crack", crack_functions, ZEND_MODULE_STARTUP_N(crack), @@ -50,6 +51,7 @@ zend_module_entry crack_module_entry = { ZEND_MODULE_ACTIVATE_N(crack), ZEND_MODULE_DEACTIVATE_N(crack), ZEND_MODULE_INFO_N(crack), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c index d556160178..16bdfc078a 100644 --- a/ext/ctype/ctype.c +++ b/ext/ctype/ctype.c @@ -62,6 +62,7 @@ function_entry ctype_functions[] = { /* {{{ ctype_mpodule_entry */ zend_module_entry ctype_module_entry = { + STANDARD_MODULE_HEADER, "ctype", ctype_functions, NULL, @@ -69,6 +70,7 @@ zend_module_entry ctype_module_entry = { NULL, NULL, PHP_MINFO(ctype), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/curl/curl.c b/ext/curl/curl.c index 6e97eaafca..3d2f93e05a 100644 --- a/ext/curl/curl.c +++ b/ext/curl/curl.c @@ -69,6 +69,7 @@ function_entry curl_functions[] = { /* {{{ curl_module_entry */ zend_module_entry curl_module_entry = { + STANDARD_MODULE_HEADER, "curl", curl_functions, PHP_MINIT(curl), @@ -76,6 +77,7 @@ zend_module_entry curl_module_entry = { NULL, NULL, PHP_MINFO(curl), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/cybercash/cybercash.c b/ext/cybercash/cybercash.c index 30393c3a93..dc4f0046b9 100644 --- a/ext/cybercash/cybercash.c +++ b/ext/cybercash/cybercash.c @@ -45,6 +45,7 @@ function_entry cybercash_functions[] = { /* {{{ cybercash_module_entry */ zend_module_entry cybercash_module_entry = { + STANDARD_MODULE_HEADER, "cybercash", cybercash_functions, NULL, @@ -52,6 +53,7 @@ zend_module_entry cybercash_module_entry = { NULL, NULL, PHP_MINFO(cybercash), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES, }; /* }}} */ diff --git a/ext/cybermut/cybermut.c b/ext/cybermut/cybermut.c index ab23da0bb8..2e6c1f8461 100644 --- a/ext/cybermut/cybermut.c +++ b/ext/cybermut/cybermut.c @@ -48,6 +48,7 @@ function_entry cybermut_functions[] = { /* {{{ cybermut_module_entry */ zend_module_entry cybermut_module_entry = { + STANDARD_MODULE_HEADER, "cybermut", cybermut_functions, PHP_MINIT(cybermut), @@ -55,6 +56,7 @@ zend_module_entry cybermut_module_entry = { NULL, NULL, PHP_MINFO(cybermut), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/cyrus/cyrus.c b/ext/cyrus/cyrus.c index b06fe9fa86..26e0dea5c2 100644 --- a/ext/cyrus/cyrus.c +++ b/ext/cyrus/cyrus.c @@ -48,6 +48,7 @@ function_entry cyrus_functions[] = { }; zend_module_entry cyrus_module_entry = { + STANDARD_MODULE_HEADER, "cyrus", cyrus_functions, PHP_MINIT(cyrus), @@ -55,6 +56,7 @@ zend_module_entry cyrus_module_entry = { NULL, NULL, PHP_MINFO(cyrus), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/db/db.c b/ext/db/db.c index 21a1c3bdfe..5b3b9f3781 100644 --- a/ext/db/db.c +++ b/ext/db/db.c @@ -1234,7 +1234,16 @@ function_entry dbm_functions[] = { /* }}} */ zend_module_entry dbm_module_entry = { - "db", dbm_functions, PHP_MINIT(db), PHP_MSHUTDOWN(db), PHP_RINIT(db), NULL, PHP_MINFO(db), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "db", + dbm_functions, + PHP_MINIT(db), + PHP_MSHUTDOWN(db), + PHP_RINIT(db), + NULL, + PHP_MINFO(db), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_DB diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 20ca60863b..b104e48860 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -60,11 +60,15 @@ static PHP_MSHUTDOWN_FUNCTION(dba); static PHP_MINFO_FUNCTION(dba); zend_module_entry dba_module_entry = { - "dba", dba_functions, + STANDARD_MODULE_HEADER, + "dba", + dba_functions, PHP_MINIT(dba), PHP_MSHUTDOWN(dba), - NULL, NULL, + NULL, + NULL, PHP_MINFO(dba), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c index c8dd84ccb6..e16c4dc9cf 100644 --- a/ext/dbase/dbase.c +++ b/ext/dbase/dbase.c @@ -785,7 +785,8 @@ function_entry dbase_functions[] = { /* }}} */ zend_module_entry dbase_module_entry = { - "dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/dbplus/dbplus.c b/ext/dbplus/dbplus.c index 8b7ee4e207..9f259ade08 100644 --- a/ext/dbplus/dbplus.c +++ b/ext/dbplus/dbplus.c @@ -118,6 +118,7 @@ function_entry dbplus_functions[] = { /* {{{ module entry */ zend_module_entry dbplus_module_entry = { + STANDARD_MODULE_HEADER, "dbplus", dbplus_functions, PHP_MINIT(dbplus), @@ -125,6 +126,7 @@ zend_module_entry dbplus_module_entry = { PHP_RINIT(dbplus), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(dbplus), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(dbplus), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/dbx/dbx.c b/ext/dbx/dbx.c index 906eab3bf3..377f7b4507 100644 --- a/ext/dbx/dbx.c +++ b/ext/dbx/dbx.c @@ -140,6 +140,7 @@ function_entry dbx_functions[] = { }; zend_module_entry dbx_module_entry = { + STANDARD_MODULE_HEADER, "dbx", dbx_functions, ZEND_MINIT(dbx), @@ -147,6 +148,7 @@ zend_module_entry dbx_module_entry = { NULL, /*ZEND_RINIT(dbx), /* Replace with NULL if there's nothing to do at request start */ NULL, /*ZEND_RSHUTDOWN(dbx), /* Replace with NULL if there's nothing to do at request end */ ZEND_MINFO(dbx), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c index 0b1c40a82b..20723a318d 100644 --- a/ext/domxml/php_domxml.c +++ b/ext/domxml/php_domxml.c @@ -266,6 +266,7 @@ static zend_function_entry php_domxmlns_class_functions[] = { }; zend_module_entry domxml_module_entry = { + STANDARD_MODULE_HEADER, "domxml", domxml_functions, PHP_MINIT(domxml), @@ -273,6 +274,7 @@ zend_module_entry domxml_module_entry = { PHP_RINIT(domxml), NULL, PHP_MINFO(domxml), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/dotnet/dotnet.cpp b/ext/dotnet/dotnet.cpp index 24a7b26315..ec9b0e7291 100644 --- a/ext/dotnet/dotnet.cpp +++ b/ext/dotnet/dotnet.cpp @@ -226,7 +226,8 @@ PHP_MSHUTDOWN_FUNCTION(DOTNET) zend_module_entry dotnet_module_entry = { - "dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; BEGIN_EXTERN_C() diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 927eaf9293..b8eb631315 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -131,11 +131,13 @@ PHP_MINFO_FUNCTION(exif); /* {{{ exif_module_entry */ zend_module_entry exif_module_entry = { + STANDARD_MODULE_HEADER, "exif", exif_functions, NULL, NULL, NULL, NULL, PHP_MINFO(exif), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c index 4f4786b6e6..311018971d 100644 --- a/ext/fbsql/php_fbsql.c +++ b/ext/fbsql/php_fbsql.c @@ -218,6 +218,7 @@ function_entry fbsql_functions[] = { /* }}} */ zend_module_entry fbsql_module_entry = { + STANDARD_MODULE_HEADER, "fbsql", fbsql_functions, PHP_MINIT(fbsql), @@ -225,6 +226,7 @@ zend_module_entry fbsql_module_entry = { PHP_RINIT(fbsql), PHP_RSHUTDOWN(fbsql), PHP_MINFO(fbsql), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c index 08a9d00563..b696543ba0 100644 --- a/ext/fdf/fdf.c +++ b/ext/fdf/fdf.c @@ -68,6 +68,7 @@ function_entry fdf_functions[] = { /* }}} */ zend_module_entry fdf_module_entry = { + STANDARD_MODULE_HEADER, "fdf", fdf_functions, PHP_MINIT(fdf), @@ -75,6 +76,7 @@ zend_module_entry fdf_module_entry = { NULL, NULL, PHP_MINFO(fdf), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c index 1b3836ed26..b1a1a35c53 100644 --- a/ext/filepro/filepro.c +++ b/ext/filepro/filepro.c @@ -144,7 +144,8 @@ function_entry filepro_functions[] = { }; zend_module_entry filepro_module_entry = { - "filepro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "filepro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/fribidi/fribidi.c b/ext/fribidi/fribidi.c index e88e48d6e6..82fc1574ce 100755 --- a/ext/fribidi/fribidi.c +++ b/ext/fribidi/fribidi.c @@ -47,6 +47,7 @@ function_entry fribidi_functions[] = { }; zend_module_entry fribidi_module_entry = { + STANDARD_MODULE_HEADER, "fribidi", fribidi_functions, PHP_MINIT(fribidi), @@ -54,6 +55,7 @@ zend_module_entry fribidi_module_entry = { NULL, NULL, PHP_MINFO(fribidi), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index dc057d1dda..3512a78d2d 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -62,6 +62,7 @@ function_entry php_ftp_functions[] = { }; zend_module_entry php_ftp_module_entry = { + STANDARD_MODULE_HEADER, "ftp", php_ftp_functions, PHP_MINIT(ftp), @@ -69,6 +70,7 @@ zend_module_entry php_ftp_module_entry = { NULL, NULL, PHP_MINFO(ftp), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -854,3 +856,11 @@ PHP_FUNCTION(ftp_quit) /* }}} */ #endif /* HAVE_FTP */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + */ diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 29be9bc8c4..cd0c99d698 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -202,7 +202,16 @@ function_entry gd_functions[] = { /* }}} */ zend_module_entry gd_module_entry = { - "gd", gd_functions, PHP_MINIT(gd), NULL, NULL, NULL, PHP_MINFO(gd), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "gd", + gd_functions, + PHP_MINIT(gd), + NULL, + NULL, + NULL, + PHP_MINFO(gd), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_GD diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index f5127b4bae..e74f3c5dfd 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -45,7 +45,8 @@ function_entry php_gettext_functions[] = { /* }}} */ zend_module_entry php_gettext_module_entry = { - "gettext", php_gettext_functions, NULL, NULL, NULL, NULL, PHP_MINFO(gettext), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "gettext", php_gettext_functions, NULL, NULL, NULL, NULL, PHP_MINFO(gettext), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_GETTEXT diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 2e2b70fb43..c114292259 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -86,6 +86,7 @@ function_entry gmp_functions[] = { /* {{{ gmp_module_entry */ zend_module_entry gmp_module_entry = { + STANDARD_MODULE_HEADER, "gmp", gmp_functions, ZEND_MODULE_STARTUP_N(gmp), @@ -93,6 +94,7 @@ zend_module_entry gmp_module_entry = { NULL, /* Replace with NULL if there's nothing to do at request start */ NULL, /* Replace with NULL if there's nothing to do at request end */ ZEND_MODULE_INFO_N(gmp), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index 077a7ae263..0baff264c1 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -129,7 +129,8 @@ function_entry hw_functions[] = { }; zend_module_entry hw_module_entry = { - "hyperwave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "hyperwave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c index 327e6d120a..989a674fab 100644 --- a/ext/icap/php_icap.c +++ b/ext/icap/php_icap.c @@ -89,7 +89,16 @@ function_entry icap_functions[] = { zend_module_entry php_icap_module_entry = { - "icap", icap_functions, PHP_MINIT(icap), NULL, NULL, NULL, PHP_MINFO(icap), 0, 0, 0, NULL + STANDARD_MODULE_HEADER, + "icap", + icap_functions, + PHP_MINIT(icap), + NULL, + NULL, + NULL, + PHP_MINFO(icap), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 0f44512e83..bbf789a425 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -62,6 +62,7 @@ function_entry iconv_functions[] = { /* {{{ iconv_module_entry */ zend_module_entry iconv_module_entry = { + STANDARD_MODULE_HEADER, "iconv", iconv_functions, PHP_MINIT(miconv), @@ -69,6 +70,7 @@ zend_module_entry iconv_module_entry = { NULL, NULL, PHP_MINFO(miconv), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 3c7a5a6997..47f7de6eca 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -158,12 +158,15 @@ function_entry imap_functions[] = { /* {{{ imap_module_entry */ zend_module_entry imap_module_entry = { + STANDARD_MODULE_HEADER, "imap", imap_functions, PHP_MINIT(imap), - NULL, PHP_RINIT(imap), + NULL, + PHP_RINIT(imap), PHP_RSHUTDOWN(imap), PHP_MINFO(imap), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec index c463fcc4dd..6d2f4c34cb 100644 --- a/ext/informix/ifx.ec +++ b/ext/informix/ifx.ec @@ -165,6 +165,7 @@ $endif; }; zend_module_entry ifx_module_entry = { + STANDARD_MODULE_HEADER, "informix", ifx_functions, PHP_MINIT(ifx), @@ -172,6 +173,7 @@ zend_module_entry ifx_module_entry = { PHP_RINIT(ifx), NULL, PHP_MINFO(ifx), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c index d9646fd1b8..2c3a97e03c 100644 --- a/ext/ingres_ii/ii.c +++ b/ext/ingres_ii/ii.c @@ -67,6 +67,7 @@ function_entry ii_functions[] = { }; zend_module_entry ingres_ii_module_entry = { + STANDARD_MODULE_HEADER, "ingres_ii", ii_functions, PHP_MINIT(ii), @@ -74,6 +75,7 @@ zend_module_entry ingres_ii_module_entry = { PHP_RINIT(ii), PHP_RSHUTDOWN(ii), PHP_MINFO(ii), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index e422a70af7..315990caba 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -108,6 +108,7 @@ function_entry ibase_functions[] = { zend_module_entry ibase_module_entry = { + STANDARD_MODULE_HEADER, "interbase", ibase_functions, PHP_MINIT(ibase), @@ -115,6 +116,7 @@ zend_module_entry ibase_module_entry = PHP_RINIT(ibase), PHP_RSHUTDOWN(ibase), PHP_MINFO(ibase), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/java/java.c b/ext/java/java.c index 9d8a9ad2e9..51a3c1aea2 100644 --- a/ext/java/java.c +++ b/ext/java/java.c @@ -631,6 +631,7 @@ static PHP_MINFO_FUNCTION(java) { } zend_module_entry java_module_entry = { + STANDARD_MODULE_HEADER, "java", java_functions, PHP_MINIT(java), @@ -638,6 +639,7 @@ zend_module_entry java_module_entry = { NULL, NULL, PHP_MINFO(java), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 8562b52753..89142476aa 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -120,6 +120,7 @@ function_entry ldap_functions[] = { /* }}} */ zend_module_entry ldap_module_entry = { + STANDARD_MODULE_HEADER, "ldap", ldap_functions, PHP_MINIT(ldap), @@ -127,6 +128,7 @@ zend_module_entry ldap_module_entry = { NULL, NULL, PHP_MINFO(ldap), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/mailparse/mailparse.c b/ext/mailparse/mailparse.c index 1d45e2fcc3..0b55a29692 100755 --- a/ext/mailparse/mailparse.c +++ b/ext/mailparse/mailparse.c @@ -64,6 +64,7 @@ function_entry mailparse_functions[] = { }; zend_module_entry mailparse_module_entry = { + STANDARD_MODULE_HEADER, "mailparse", mailparse_functions, PHP_MINIT(mailparse), @@ -71,6 +72,7 @@ zend_module_entry mailparse_module_entry = { PHP_RINIT(mailparse), PHP_RSHUTDOWN(mailparse), PHP_MINFO(mailparse), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 1803497270..5bf0e19e9f 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -131,6 +131,7 @@ function_entry mbstring_functions[] = { }; zend_module_entry mbstring_module_entry = { + STANDARD_MODULE_HEADER, "mbstring", mbstring_functions, PHP_MINIT(mbstring), @@ -138,6 +139,7 @@ zend_module_entry mbstring_module_entry = { PHP_RINIT(mbstring), PHP_RSHUTDOWN(mbstring), PHP_MINFO(mbstring), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c index d7a3f083a3..04d86fe9db 100644 --- a/ext/mcal/php_mcal.c +++ b/ext/mcal/php_mcal.c @@ -111,7 +111,16 @@ function_entry mcal_functions[] = { }; zend_module_entry php_mcal_module_entry = { - "mcal", mcal_functions, PHP_MINIT(mcal), NULL, NULL, NULL, PHP_MINFO(mcal), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "mcal", + mcal_functions, + PHP_MINIT(mcal), + NULL, + NULL, + NULL, + PHP_MINFO(mcal), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_MCAL diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 40fd8646dc..8d5f0596ac 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -88,11 +88,13 @@ static PHP_MINIT_FUNCTION(mcrypt); static PHP_MSHUTDOWN_FUNCTION(mcrypt); zend_module_entry mcrypt_module_entry = { + STANDARD_MODULE_HEADER, "mcrypt", mcrypt_functions, PHP_MINIT(mcrypt), PHP_MSHUTDOWN(mcrypt), NULL, NULL, PHP_MINFO(mcrypt), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES, }; diff --git a/ext/mhash/mhash.c b/ext/mhash/mhash.c index 68950f9bfc..07a67bd2dd 100644 --- a/ext/mhash/mhash.c +++ b/ext/mhash/mhash.c @@ -46,11 +46,13 @@ function_entry mhash_functions[] = { static PHP_MINIT_FUNCTION(mhash); zend_module_entry mhash_module_entry = { + STANDARD_MODULE_HEADER, "mhash", mhash_functions, PHP_MINIT(mhash), NULL, NULL, NULL, NULL, + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES, }; diff --git a/ext/ming/ming.c b/ext/ming/ming.c index 507af0572f..f0bf038faf 100644 --- a/ext/ming/ming.c +++ b/ext/ming/ming.c @@ -2920,6 +2920,7 @@ PHP_FUNCTION(swftextfield_addString) /* }}} */ zend_module_entry ming_module_entry = { + STANDARD_MODULE_HEADER, "ming", ming_functions, PHP_MINIT(ming), @@ -2927,6 +2928,7 @@ zend_module_entry ming_module_entry = { NULL, NULL, PHP_MINFO(ming), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/mnogosearch/php_mnogo.c b/ext/mnogosearch/php_mnogo.c index f4c0d42758..549833d922 100644 --- a/ext/mnogosearch/php_mnogo.c +++ b/ext/mnogosearch/php_mnogo.c @@ -145,6 +145,7 @@ function_entry mnogosearch_functions[] = { /* }}} */ zend_module_entry mnogosearch_module_entry = { + STANDARD_MODULE_HEADER, "mnogosearch", mnogosearch_functions, PHP_MINIT(mnogosearch), @@ -152,6 +153,7 @@ zend_module_entry mnogosearch_module_entry = { PHP_RINIT(mnogosearch), NULL, PHP_MINFO(mnogosearch), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index 7a9444518d..928764d968 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -103,8 +103,9 @@ function_entry msql_functions[] = { /* }}} */ zend_module_entry msql_module_entry = { + STANDARD_MODULE_HEADER, "msql", msql_functions, PHP_MINIT(msql), NULL, PHP_RINIT(msql), NULL, - PHP_MINFO(msql), STANDARD_MODULE_PROPERTIES + PHP_MINFO(msql), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/muscat/muscat.c b/ext/muscat/muscat.c index 2b32633205..1dfbc3dd5c 100644 --- a/ext/muscat/muscat.c +++ b/ext/muscat/muscat.c @@ -61,6 +61,7 @@ function_entry muscat_functions[] = { }; zend_module_entry muscat_module_entry = { + STANDARD_MODULE_HEADER, "muscat", muscat_functions, PHP_MINIT(muscat), @@ -68,6 +69,7 @@ zend_module_entry muscat_module_entry = { PHP_RINIT(muscat), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(muscat), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(muscat), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index f1aab4eed9..32f0042f6b 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -182,8 +182,16 @@ function_entry mysql_functions[] = { /* {{{ mysql_module_entry */ zend_module_entry mysql_module_entry = { - "mysql", mysql_functions, ZEND_MODULE_STARTUP_N(mysql), PHP_MSHUTDOWN(mysql), PHP_RINIT(mysql), PHP_RSHUTDOWN(mysql), - PHP_MINFO(mysql), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "mysql", + mysql_functions, + ZEND_MODULE_STARTUP_N(mysql), + PHP_MSHUTDOWN(mysql), + PHP_RINIT(mysql), + PHP_RSHUTDOWN(mysql), + PHP_MINFO(mysql), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/ncurses/ncurses.c b/ext/ncurses/ncurses.c index 2b7b28c31d..539459eedc 100644 --- a/ext/ncurses/ncurses.c +++ b/ext/ncurses/ncurses.c @@ -46,6 +46,7 @@ static void ncurses_destruct(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ ncurses_module_entry */ zend_module_entry ncurses_module_entry = { + STANDARD_MODULE_HEADER, "ncurses", ncurses_functions, PHP_MINIT(ncurses), @@ -53,6 +54,7 @@ zend_module_entry ncurses_module_entry = { PHP_RINIT(ncurses), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(ncurses), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(ncurses), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/notes/php_notes.c b/ext/notes/php_notes.c index 4b42040c38..bf8d301f7b 100644 --- a/ext/notes/php_notes.c +++ b/ext/notes/php_notes.c @@ -97,6 +97,7 @@ function_entry notes_functions[] = { }; zend_module_entry notes_module_entry = { + STANDARD_MODULE_HEADER, "notes", notes_functions, PHP_MINIT(notes), @@ -104,6 +105,7 @@ zend_module_entry notes_module_entry = { PHP_RINIT(notes), PHP_RSHUTDOWN(notes), PHP_MINFO(notes), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 7b5e6c54bf..acd26a38fc 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -386,6 +386,7 @@ static zend_function_entry php_oci_coll_class_functions[] = { #endif zend_module_entry oci8_module_entry = { + STANDARD_MODULE_HEADER, "oci8", /* extension name */ php_oci_functions, /* extension function list */ PHP_MINIT(oci), /* extension-wide startup function */ @@ -393,6 +394,7 @@ zend_module_entry oci8_module_entry = { PHP_RINIT(oci), /* per-request startup function */ PHP_RSHUTDOWN(oci), /* per-request shutdown function */ PHP_MINFO(oci), /* information function */ + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 4fdde9db5f..66977b9bd2 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -135,6 +135,7 @@ function_entry odbc_functions[] = { /* {{{ odbc_module_entry */ zend_module_entry odbc_module_entry = { + STANDARD_MODULE_HEADER, "odbc", odbc_functions, PHP_MINIT(odbc), @@ -142,6 +143,7 @@ zend_module_entry odbc_module_entry = { PHP_RINIT(odbc), PHP_RSHUTDOWN(odbc), PHP_MINFO(odbc), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c index b9e8888ae0..f3032629d9 100644 --- a/ext/odbc/velocis.c +++ b/ext/odbc/velocis.c @@ -65,8 +65,10 @@ function_entry velocis_functions[] = { }; zend_module_entry velocis_module_entry = { + STANDARD_MODULE_HEADER, "velocis", velocis_functions, PHP_MINIT(velocis), PHP_MSHUTDOWN(velocis), - PHP_RINIT(velocis), NULL, PHP_MINFO(velocis), STANDARD_MODULE_PROPERTIES + PHP_RINIT(velocis), NULL, PHP_MINFO(velocis), NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 3d14c37b92..844f4ba016 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -82,6 +82,7 @@ function_entry openssl_functions[] = { /* {{{ openssl_module_entry */ zend_module_entry openssl_module_entry = { + STANDARD_MODULE_HEADER, "openssl", openssl_functions, PHP_MINIT(openssl), @@ -89,6 +90,7 @@ zend_module_entry openssl_module_entry = { NULL, NULL, PHP_MINFO(openssl), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c index 2b1bc689b9..0f4dd2c3d8 100644 --- a/ext/oracle/oracle.c +++ b/ext/oracle/oracle.c @@ -146,6 +146,7 @@ function_entry oracle_functions[] = { /* {{{ oracle_module_entry */ zend_module_entry oracle_module_entry = { + STANDARD_MODULE_HEADER, "oracle", oracle_functions, PHP_MINIT(oracle), /* extension-wide startup function */ @@ -153,6 +154,7 @@ zend_module_entry oracle_module_entry = { PHP_RINIT(oracle), /* per-request startup function */ PHP_RSHUTDOWN(oracle), /* per-request shutdown function */ PHP_MINFO(oracle), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/ovrimos/ovrimos.c b/ext/ovrimos/ovrimos.c index 6aeb07a002..c385f6a740 100644 --- a/ext/ovrimos/ovrimos.c +++ b/ext/ovrimos/ovrimos.c @@ -1299,13 +1299,15 @@ function_entry ovrimos_functions[] = { /* }}} */ zend_module_entry ovrimos_module_entry = { - "Ovrimos", + STANDARD_MODULE_HEADER, + "ovrimos", ovrimos_functions, NULL, NULL, NULL, NULL, PHP_MINFO(ovrimos), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index f2ae7f4ca2..343eac71ca 100755 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -54,12 +54,15 @@ function_entry pcntl_functions[] = { }; zend_module_entry pcntl_module_entry = { - "pcntl", pcntl_functions, + STANDARD_MODULE_HEADER, + "pcntl", + pcntl_functions, PHP_MINIT(pcntl), PHP_MSHUTDOWN(pcntl), NULL, NULL, PHP_MINFO(pcntl), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index bae6f8fa80..e8e461951e 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1364,12 +1364,15 @@ function_entry pcre_functions[] = { }; zend_module_entry pcre_module_entry = { - "pcre", pcre_functions, + STANDARD_MODULE_HEADER, + "pcre", + pcre_functions, PHP_MINIT(pcre), PHP_MSHUTDOWN(pcre), PHP_RINIT(pcre), NULL, PHP_MINFO(pcre), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c index 62b63d183f..2754870b14 100644 --- a/ext/pdf/pdf.c +++ b/ext/pdf/pdf.c @@ -236,6 +236,7 @@ function_entry pdf_functions[] = { /* {{{ pdf_module_entry */ zend_module_entry pdf_module_entry = { + STANDARD_MODULE_HEADER, "pdf", pdf_functions, PHP_MINIT(pdf), @@ -243,6 +244,7 @@ zend_module_entry pdf_module_entry = { NULL, NULL, PHP_MINFO(pdf), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/pfpro/pfpro.c b/ext/pfpro/pfpro.c index aa1d4b5640..d4ded8cece 100644 --- a/ext/pfpro/pfpro.c +++ b/ext/pfpro/pfpro.c @@ -57,6 +57,7 @@ function_entry pfpro_functions[] = { /* {{{ Zend module entry */ zend_module_entry pfpro_module_entry = { + STANDARD_MODULE_HEADER, "pfpro", pfpro_functions, PHP_MINIT(pfpro), @@ -64,6 +65,7 @@ zend_module_entry pfpro_module_entry = { PHP_RINIT(pfpro), /* request start */ PHP_RSHUTDOWN(pfpro), /* request end */ PHP_MINFO(pfpro), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 45f0d497ad..41af337eea 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -101,6 +101,7 @@ function_entry pgsql_functions[] = { /* {{{ pgsql_module_entry */ zend_module_entry pgsql_module_entry = { + STANDARD_MODULE_HEADER, "pgsql", pgsql_functions, PHP_MINIT(pgsql), @@ -108,6 +109,7 @@ zend_module_entry pgsql_module_entry = { PHP_RINIT(pgsql), PHP_RSHUTDOWN(pgsql), PHP_MINFO(pgsql), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 8d458af981..2320ed9df5 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -110,6 +110,7 @@ static PHP_MINFO_FUNCTION(posix); /* {{{ posix_module_entry */ zend_module_entry posix_module_entry = { + STANDARD_MODULE_HEADER, "posix", posix_functions, NULL, @@ -117,6 +118,7 @@ zend_module_entry posix_module_entry = { NULL, NULL, PHP_MINFO(posix), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c index 9d0d91593b..3e823477c4 100644 --- a/ext/pspell/pspell.c +++ b/ext/pspell/pspell.c @@ -71,7 +71,8 @@ function_entry pspell_functions[] = { static int le_pspell, le_pspell_config; zend_module_entry pspell_module_entry = { - "pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_PSPELL diff --git a/ext/qtdom/qtdom.c b/ext/qtdom/qtdom.c index 0fa2093abd..dd32b71f9b 100644 --- a/ext/qtdom/qtdom.c +++ b/ext/qtdom/qtdom.c @@ -53,6 +53,7 @@ function_entry qtdom_functions[] = { }; zend_module_entry qtdom_module_entry = { + STANDARD_MODULE_HEADER, "qtdom", qtdom_functions, PHP_MINIT(qtdom), @@ -60,6 +61,7 @@ zend_module_entry qtdom_module_entry = { NULL, NULL, PHP_MINFO(qtdom), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 0acd4139bb..41a9ef7abc 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -69,6 +69,7 @@ static zend_function_entry php_readline_functions[] = { }; zend_module_entry readline_module_entry = { + STANDARD_MODULE_HEADER, "readline", php_readline_functions, PHP_MINIT(readline), @@ -76,6 +77,7 @@ zend_module_entry readline_module_entry = { NULL, PHP_RSHUTDOWN(readline), NULL, + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/recode/recode.c b/ext/recode/recode.c index f9261c9d6e..e0ad838076 100644 --- a/ext/recode/recode.c +++ b/ext/recode/recode.c @@ -54,13 +54,15 @@ static zend_function_entry php_recode_functions[] = { }; zend_module_entry recode_module_entry = { - "Recode", + STANDARD_MODULE_HEADER, + "recode", php_recode_functions, PHP_MINIT(recode), PHP_MSHUTDOWN(recode), NULL, NULL, PHP_MINFO(recode), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c index a8b49f7d59..52b085a7a7 100644 --- a/ext/rpc/com/com_wrapper.c +++ b/ext/rpc/com/com_wrapper.c @@ -1681,7 +1681,16 @@ PHP_MSHUTDOWN_FUNCTION(COM) /* exports for external object creation */ zend_module_entry COM_module_entry = { - "com", COM_functions, PHP_MINIT(COM), PHP_MSHUTDOWN(COM), NULL, NULL, PHP_MINFO(COM), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "com", + COM_functions, + PHP_MINIT(COM), + PHP_MSHUTDOWN(COM), + NULL, + NULL, + PHP_MINFO(COM), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; PHPAPI int php_COM_get_le_comval() @@ -1690,3 +1699,11 @@ PHPAPI int php_COM_get_le_comval() } #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + */ diff --git a/ext/rpc/dotnet/dotnet.cpp b/ext/rpc/dotnet/dotnet.cpp index 24a7b26315..ec9b0e7291 100644 --- a/ext/rpc/dotnet/dotnet.cpp +++ b/ext/rpc/dotnet/dotnet.cpp @@ -226,7 +226,8 @@ PHP_MSHUTDOWN_FUNCTION(DOTNET) zend_module_entry dotnet_module_entry = { - "dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; BEGIN_EXTERN_C() diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index 9d8a9ad2e9..51a3c1aea2 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -631,6 +631,7 @@ static PHP_MINFO_FUNCTION(java) { } zend_module_entry java_module_entry = { + STANDARD_MODULE_HEADER, "java", java_functions, PHP_MINIT(java), @@ -638,6 +639,7 @@ zend_module_entry java_module_entry = { NULL, NULL, PHP_MINFO(java), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/sablot/sablot.c b/ext/sablot/sablot.c index 228b52e298..98c7500020 100644 --- a/ext/sablot/sablot.c +++ b/ext/sablot/sablot.c @@ -195,6 +195,7 @@ function_entry sablot_functions[] = { }; zend_module_entry sablot_module_entry = { + STANDARD_MODULE_HEADER, "sablot", sablot_functions, PHP_MINIT(sablot), @@ -202,6 +203,7 @@ zend_module_entry sablot_module_entry = { NULL, PHP_RSHUTDOWN(sablot), PHP_MINFO(sablot), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/satellite/php_orbit.c b/ext/satellite/php_orbit.c index 7fa82a6aca..9415268a65 100644 --- a/ext/satellite/php_orbit.c +++ b/ext/satellite/php_orbit.c @@ -81,6 +81,7 @@ static function_entry satellite_functions[] = { * module entry */ zend_module_entry satellite_module_entry = { + STANDARD_MODULE_HEADER, "satellite", satellite_functions, PHP_MINIT(satellite), /* module startup */ @@ -88,6 +89,7 @@ zend_module_entry satellite_module_entry = { NULL, /* request startup */ NULL, /* request shutdown */ PHP_MINFO(satellite), /* module info */ + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c index c657bf1832..24ae973238 100644 --- a/ext/session/mod_mm.c +++ b/ext/session/mod_mm.c @@ -394,11 +394,13 @@ PS_GC_FUNC(mm) } zend_module_entry php_session_mm_module = { + STANDARD_MODULE_HEADER, "session mm", NULL, PHP_MINIT(ps_mm), PHP_MSHUTDOWN(ps_mm), NULL, NULL, NULL, + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/session/session.c b/ext/session/session.c index 538f9d1264..833fb9dc25 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -193,11 +193,13 @@ static void php_rshutdown_session_globals(TSRMLS_D); static zend_bool php_session_destroy(TSRMLS_D); zend_module_entry session_module_entry = { + STANDARD_MODULE_HEADER, "session", session_functions, PHP_MINIT(session), PHP_MSHUTDOWN(session), PHP_RINIT(session), PHP_RSHUTDOWN(session), PHP_MINFO(session), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c index a19dd12037..0be9d5a397 100644 --- a/ext/shmop/shmop.c +++ b/ext/shmop/shmop.c @@ -61,6 +61,7 @@ function_entry shmop_functions[] = { /* {{{ shmop_module_entry */ zend_module_entry shmop_module_entry = { + STANDARD_MODULE_HEADER, "shmop", shmop_functions, PHP_MINIT(shmop), @@ -68,6 +69,7 @@ zend_module_entry shmop_module_entry = { NULL, NULL, PHP_MINFO(shmop), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index bcb8116dcf..3accd19461 100644 --- a/ext/skeleton/skeleton.c +++ b/ext/skeleton/skeleton.c @@ -30,6 +30,7 @@ function_entry extname_functions[] = { /* {{{ extname_module_entry */ zend_module_entry extname_module_entry = { + STANDARD_MODULE_HEADER, "extname", extname_functions, PHP_MINIT(extname), @@ -37,6 +38,7 @@ zend_module_entry extname_module_entry = { PHP_RINIT(extname), /* Replace with NULL if there's nothing to do at request start */ PHP_RSHUTDOWN(extname), /* Replace with NULL if there's nothing to do at request end */ PHP_MINFO(extname), + "0.1", /* Replace with version number for your extension */ STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 7de02c1930..d003231596 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -96,6 +96,7 @@ function_entry snmp_functions[] = { /* {{{ snmp_module_entry */ zend_module_entry snmp_module_entry = { + STANDARD_MODULE_HEADER, "snmp", snmp_functions, PHP_MINIT(snmp), @@ -103,6 +104,7 @@ zend_module_entry snmp_module_entry = { NULL, NULL, PHP_MINFO(snmp), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c index ad590e47c7..e5b5b1c4c4 100644 --- a/ext/snmp/winsnmp.c +++ b/ext/snmp/winsnmp.c @@ -33,7 +33,16 @@ function_entry snmp_functions[] = { /* {{{ snmp_module_entry */ zend_module_entry snmp_module_entry = { - "SNMP",snmp_functions,NULL,NULL,NULL,NULL,NULL,0,0,0,NULL + STANDARD_MODULE_HEADER, + "SNMP", + snmp_functions, + NULL, + NULL, + NULL, + NULL, + NULL, + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 68bcd01afe..a3944817e6 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -152,6 +152,7 @@ function_entry sockets_functions[] = { /* }}} */ zend_module_entry sockets_module_entry = { + STANDARD_MODULE_HEADER, "sockets", sockets_functions, PHP_MINIT(sockets), @@ -159,6 +160,7 @@ zend_module_entry sockets_module_entry = { NULL, NULL, PHP_MINFO(sockets), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index ece688a7a4..381c662de1 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -669,6 +669,7 @@ PHP_INI_END() zend_module_entry basic_functions_module = { + STANDARD_MODULE_HEADER, "standard", /* extension name */ basic_functions, /* function list */ PHP_MINIT(basic), /* process startup */ @@ -676,6 +677,7 @@ zend_module_entry basic_functions_module = { PHP_RINIT(basic), /* request startup */ PHP_RSHUTDOWN(basic), /* request shutdown */ PHP_MINFO(basic), /* extension info */ + PHP_VERSION, /* extension version */ STANDARD_MODULE_PROPERTIES }; diff --git a/ext/standard/info.c b/ext/standard/info.c index 0227db10eb..c84ddcf645 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -473,15 +473,26 @@ PHP_FUNCTION(phpinfo) /* }}} */ -/* {{{ proto string phpversion(void) +/* {{{ proto string phpversion([string extension]) Return the current PHP version */ PHP_FUNCTION(phpversion) { - if (ZEND_NUM_ARGS() != 0) { - WRONG_PARAM_COUNT; - } + zval **arg; + int argc = ZEND_NUM_ARGS(); + if (argc == 0) { RETURN_STRING(PHP_VERSION, 1); + } else if (argc == 1 && zend_get_parameters_ex(1, &arg) == SUCCESS) { + char *version; + convert_to_string_ex(arg); + version = zend_get_module_version(Z_STRVAL_PP(arg)); + if (version == NULL) { + RETURN_FALSE; + } + RETURN_STRING(version, 1); + } else { + WRONG_PARAM_COUNT; + } } /* }}} */ diff --git a/ext/swf/swf.c b/ext/swf/swf.c index 3b0ca328b7..91781aeede 100644 --- a/ext/swf/swf.c +++ b/ext/swf/swf.c @@ -111,6 +111,7 @@ function_entry swf_functions[] = { /* {{{ swf_module_entry */ zend_module_entry swf_module_entry = { + STANDARD_MODULE_HEADER, "swf", swf_functions, PHP_MINIT(swf), @@ -118,6 +119,7 @@ zend_module_entry swf_module_entry = { PHP_RINIT(swf), NULL, PHP_MINFO(swf), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c index db6adf7ceb..c6abe112f1 100644 --- a/ext/sybase/php_sybase_db.c +++ b/ext/sybase/php_sybase_db.c @@ -86,7 +86,8 @@ function_entry sybase_functions[] = { }; zend_module_entry sybase_module_entry = { - "sybase", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "sybase", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_SYBASE diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c index 66b6ed29d4..ecb6c44d57 100644 --- a/ext/sybase_ct/php_sybase_ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -80,7 +80,8 @@ function_entry sybase_functions[] = { }; zend_module_entry sybase_module_entry = { - "sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; ZEND_DECLARE_MODULE_GLOBALS(sybase) diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index 186a1d11a9..b3dae94699 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -70,7 +70,8 @@ function_entry sysvsem_functions[] = { /* {{{ sysvsem_module_entry */ zend_module_entry sysvsem_module_entry = { - "sysvsem", sysvsem_functions, PHP_MINIT(sysvsem), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_HEADER, + "sysvsem", sysvsem_functions, PHP_MINIT(sysvsem), NULL, NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index eeacad9d7f..e7023b4dc0 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -54,10 +54,12 @@ function_entry sysvshm_functions[] = { /* {{{ sysvshm_module_entry */ zend_module_entry sysvshm_module_entry = { + STANDARD_MODULE_HEADER, "sysvshm", sysvshm_functions, PHP_MINIT(sysvshm), NULL, NULL, NULL, NULL, + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/vpopmail/php_vpopmail.c b/ext/vpopmail/php_vpopmail.c index 74b466f992..a7abd61435 100644 --- a/ext/vpopmail/php_vpopmail.c +++ b/ext/vpopmail/php_vpopmail.c @@ -91,6 +91,7 @@ function_entry vpopmail_functions[] = { }; zend_module_entry vpopmail_module_entry = { + STANDARD_MODULE_HEADER, "vpopmail", vpopmail_functions, PHP_MINIT(vpopmail), @@ -98,6 +99,7 @@ zend_module_entry vpopmail_module_entry = { PHP_RINIT(vpopmail), PHP_RSHUTDOWN(vpopmail), PHP_MINFO(vpopmail), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index b20f5e1a3b..4ed12f14eb 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -105,6 +105,7 @@ PHP_MINFO_FUNCTION(wddx); /* {{{ wddx_module_entry */ zend_module_entry wddx_module_entry = { + STANDARD_MODULE_HEADER, "wddx", wddx_functions, PHP_MINIT(wddx), @@ -112,6 +113,7 @@ zend_module_entry wddx_module_entry = { NULL, NULL, PHP_MINFO(wddx), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/xml/xml.c b/ext/xml/xml.c index edc23c782f..4031cda623 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -132,6 +132,7 @@ function_entry xml_functions[] = { }; zend_module_entry xml_module_entry = { + STANDARD_MODULE_HEADER, "xml", /* extension name */ xml_functions, /* extension function list */ PHP_MINIT(xml), /* extension-wide startup function */ @@ -139,6 +140,7 @@ zend_module_entry xml_module_entry = { PHP_RINIT(xml), /* per-request startup function */ PHP_RSHUTDOWN(xml), /* per-request shutdown function */ PHP_MINFO(xml), /* information function */ + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/xslt/sablot.c b/ext/xslt/sablot.c index f439311555..7ed598d8fe 100644 --- a/ext/xslt/sablot.c +++ b/ext/xslt/sablot.c @@ -95,6 +95,7 @@ function_entry xslt_functions[] = { /* {{{ xslt_module_entry */ zend_module_entry xslt_module_entry = { + STANDARD_MODULE_HEADER, "xslt", xslt_functions, PHP_MINIT(xslt), @@ -102,6 +103,7 @@ zend_module_entry xslt_module_entry = { NULL, NULL, PHP_MINFO(xslt), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/yaz/php_yaz.c b/ext/yaz/php_yaz.c index 8862fdef00..93d7f15c64 100644 --- a/ext/yaz/php_yaz.c +++ b/ext/yaz/php_yaz.c @@ -2678,6 +2678,7 @@ PHP_RINIT_FUNCTION(yaz) } zend_module_entry yaz_module_entry = { + STANDARD_MODULE_HEADER, "yaz", yaz_functions, PHP_MINIT(yaz), @@ -2685,6 +2686,7 @@ zend_module_entry yaz_module_entry = { PHP_RINIT(yaz), PHP_RSHUTDOWN(yaz), PHP_MINFO(yaz), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/yp/yp.c b/ext/yp/yp.c index db26404acc..1be4b2cc37 100644 --- a/ext/yp/yp.c +++ b/ext/yp/yp.c @@ -56,6 +56,7 @@ function_entry yp_functions[] = { }; zend_module_entry yp_module_entry = { + STANDARD_MODULE_HEADER, "yp", yp_functions, PHP_MINIT(yp), @@ -63,6 +64,7 @@ zend_module_entry yp_module_entry = { PHP_RINIT(yp), NULL, PHP_MINFO(yp), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/zip/zip.c b/ext/zip/zip.c index 4780c38f00..c0b24f989d 100644 --- a/ext/zip/zip.c +++ b/ext/zip/zip.c @@ -56,6 +56,7 @@ function_entry zip_functions[] = { /* {{{ zip_module_entry */ zend_module_entry zip_module_entry = { + STANDARD_MODULE_HEADER, "zip", zip_functions, PHP_MINIT(zip), @@ -63,6 +64,7 @@ zend_module_entry zip_module_entry = { NULL, NULL, PHP_MINFO(zip), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index b331bad23a..4a34226b33 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -112,6 +112,7 @@ function_entry php_zlib_functions[] = { /* {{{ php_zlib_module_entry */ zend_module_entry php_zlib_module_entry = { + STANDARD_MODULE_HEADER, "zlib", php_zlib_functions, PHP_MINIT(zlib), @@ -119,6 +120,7 @@ zend_module_entry php_zlib_module_entry = { PHP_RINIT(zlib), NULL, PHP_MINFO(zlib), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; /* }}} */ |