cvs: php4 /ext/aspell php_aspell.h /ext/com COM.c VARIANT.c php_COM.h php_VARIANT.h /ext/cpdf php_cpdf.h /ext/dbase php_dbase.h /ext/dbplus
dbplus.c /ext/dbx dbx.c /ext/domxml php_domxml.c php_domxml.h /ext/dotnet dotnet.cpp php_dotnet.h /ext/fbsql php_fbsql.h /ext/filepro
php_filepro.h /ext/gd php_gd.h /ext/gmp gmp.c /ext/hyperwave hw.c php_hyperwave.h /ext/icap php_icap.c php_icap.h /ext/iisfunc setup.h
/ext/interbase interbase.c php_interbase.h /ext/java java.c /ext/mbstring mbstring.h /ext/mcal php_mcal.h /ext/ming ming.c /ext/mssql php_mssql.c
php_mssql.h /ext/mysql php_mysql.h /ext/ncurses ncurses.c /ext/notes php_notes.h /ext/oci8 oci8.c /ext/odbc php_odbc.h php_velocis.h velocis.c
/ext/oracle oracle.c /ext/pcre php_pcre.c /ext/pdf php_pdf.h /ext/qtdom qtdom.c /ext/recode php_recode.h recode.c /ext/satellite class.h
php_orbit.h /ext/shmop shmop.c /ext/standard assert.c basic_functions.c dir.c incomplete_class.c pack.h php_browscap.h php_crypt.h string.c
/ext/swf php_swf.h /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c /ext/sysvsem sysvsem.c /ext/sysvshm php_sysvshm.h /ext/xslt
sablot.c /ext/zip zip.c /ext/zlib zlib.c /main internal_functions_win32.c main.c php.h /sapi/apache mod_php4.c

zeev Sun Jul 29 21:56:45 2001 EDT Modified files: /php4/ext/aspell php_aspell.h /php4/ext/com COM.c VARIANT.c php_COM.h php_VARIANT.h /php4/ext/cpdf php_cpdf.h /php4/ext/dbase php_dbase.h /php4/ext/dbplus dbplus.c /php4/ext/dbx dbx.c /php4/ext/domxml php_domxml.c php_domxml.h /php4/ext/dotnet dotnet.cpp php_dotnet.h /php4/ext/fbsql php_fbsql.h /php4/ext/filepro php_filepro.h /php4/ext/gd php_gd.h /php4/ext/gmp gmp.c /php4/ext/hyperwave hw.c php_hyperwave.h /php4/ext/icap php_icap.c php_icap.h /php4/ext/iisfunc setup.h /php4/ext/interbase interbase.c php_interbase.h /php4/ext/java java.c /php4/ext/mbstring mbstring.h /php4/ext/mcal php_mcal.h /php4/ext/ming ming.c /php4/ext/mssql php_mssql.c php_mssql.h /php4/ext/mysql php_mysql.h /php4/ext/ncurses ncurses.c /php4/ext/notes php_notes.h /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.h php_velocis.h velocis.c /php4/ext/oracle oracle.c /php4/ext/pcre php_pcre.c /php4/ext/pdf php_pdf.h /php4/ext/qtdom qtdom.c /php4/ext/recode php_recode.h recode.c /php4/ext/satellite class.h php_orbit.h /php4/ext/shmop shmop.c /php4/ext/standard assert.c basic_functions.c dir.c incomplete_class.c pack.h php_browscap.h php_crypt.h string.c /php4/ext/swf php_swf.h /php4/ext/sybase php_sybase_db.c /php4/ext/sybase_ct php_sybase_ct.c /php4/ext/sysvsem sysvsem.c /php4/ext/sysvshm php_sysvshm.h /php4/ext/xslt sablot.c /php4/ext/zip zip.c /php4/ext/zlib zlib.c /php4/main internal_functions_win32.c main.c php.h /php4/sapi/apache mod_php4.c Log: Avoid TSRMLS_FETCH()'s, and clean up a bit of stale extern's and layout on the way

Index: php4/ext/aspell/php_aspell.h diff -u php4/ext/aspell/php_aspell.h:1.6 php4/ext/aspell/php_aspell.h:1.7 --- php4/ext/aspell/php_aspell.h:1.6 Mon Feb 26 01:06:47 2001 +++ php4/ext/aspell/php_aspell.h Sun Jul 29 21:56:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_aspell.h,v 1.6 2001/02/26 06:06:47 andi Exp $ */ +/* $Id: php_aspell.h,v 1.7 2001/07/30 01:56:21 zeev Exp $ */ #ifndef PHP_ASPELL_H #define PHP_ASPELL_H @@ -24,8 +24,8 @@ extern zend_module_entry aspell_module_entry; #define aspell_module_ptr &aspell_module_entry -extern PHP_MINIT_FUNCTION(aspell); -extern PHP_MINFO_FUNCTION(aspell); +PHP_MINIT_FUNCTION(aspell); +PHP_MINFO_FUNCTION(aspell); PHP_FUNCTION(aspell_new); PHP_FUNCTION(aspell_check); Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.33 php4/ext/com/COM.c:1.34 --- php4/ext/com/COM.c:1.33 Sat Jul 28 14:55:48 2001 +++ php4/ext/com/COM.c Sun Jul 29 21:56:21 2001 @@ -1686,14 +1686,16 @@ } /* }}} */ -void php_register_COM_class() +void php_register_COM_class(void) { + TSRMLS_FETCH(); + INIT_OVERLOADED_CLASS_ENTRY(com_class_entry, "COM", NULL, php_COM_call_function_handler, php_COM_get_property_handler, php_COM_set_property_handler); - zend_register_internal_class(&com_class_entry); + zend_register_internal_class(&com_class_entry TSRMLS_CC); } PHP_MINIT_FUNCTION(COM) Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.16 php4/ext/com/VARIANT.c:1.17 --- php4/ext/com/VARIANT.c:1.16 Sat Jul 28 14:55:48 2001 +++ php4/ext/com/VARIANT.c Sun Jul 29 21:56:21 2001 @@ -426,14 +426,16 @@ efree(rsrc); } -void php_register_VARIANT_class() +void php_register_VARIANT_class(void) { + TSRMLS_FETCH(); + INIT_OVERLOADED_CLASS_ENTRY(VARIANT_class_entry, "VARIANT", NULL, php_VARIANT_call_function_handler, php_VARIANT_get_property_handler, php_VARIANT_set_property_handler); - zend_register_internal_class(&VARIANT_class_entry); + zend_register_internal_class(&VARIANT_class_entry TSRMLS_CC); } #endif /* PHP_WIN32 */ Index: php4/ext/com/php_COM.h diff -u php4/ext/com/php_COM.h:1.7 php4/ext/com/php_COM.h:1.8 --- php4/ext/com/php_COM.h:1.7 Sun Jun 24 17:09:16 2001 +++ php4/ext/com/php_COM.h Sun Jul 29 21:56:21 2001 @@ -7,25 +7,25 @@ BEGIN_EXTERN_C() -extern PHP_MINIT_FUNCTION(COM); -extern PHP_MSHUTDOWN_FUNCTION(COM); +PHP_MINIT_FUNCTION(COM); +PHP_MSHUTDOWN_FUNCTION(COM); -extern PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult); -extern PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId); -extern PHPAPI HRESULT php_COM_release(comval *obj); -extern PHPAPI HRESULT php_COM_addref(comval *obj); -extern PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* pDisp, int cleanup); -extern PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup); +PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult); +PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId); +PHPAPI HRESULT php_COM_release(comval *obj); +PHPAPI HRESULT php_COM_addref(comval *obj); +PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* pDisp, int cleanup); +PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup); -extern int php_COM_get_le_comval(); +int php_COM_get_le_comval(); -extern zend_module_entry COM_module_entry; -extern zend_class_entry com_class_entry; +zend_module_entry COM_module_entry; +zend_class_entry com_class_entry; -extern pval php_COM_get_property_handler(zend_property_reference *property_reference); -extern int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value); -extern char *php_COM_error_message(HRESULT hr); -extern void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference); +pval php_COM_get_property_handler(zend_property_reference *property_reference); +int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value); +char *php_COM_error_message(HRESULT hr); +void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference); #ifdef DEBUG extern int resourcecounter; Index: php4/ext/com/php_VARIANT.h diff -u php4/ext/com/php_VARIANT.h:1.3 php4/ext/com/php_VARIANT.h:1.4 --- php4/ext/com/php_VARIANT.h:1.3 Sun Jun 24 17:09:07 2001 +++ php4/ext/com/php_VARIANT.h Sun Jul 29 21:56:21 2001 @@ -7,8 +7,8 @@ extern int php_VARIANT_get_le_variant(); -extern PHP_MINIT_FUNCTION(VARIANT); -extern PHP_MSHUTDOWN_FUNCTION(VARIANT); +PHP_MINIT_FUNCTION(VARIANT); +PHP_MSHUTDOWN_FUNCTION(VARIANT); extern zend_module_entry VARIANT_module_entry; Index: php4/ext/cpdf/php_cpdf.h diff -u php4/ext/cpdf/php_cpdf.h:1.9 php4/ext/cpdf/php_cpdf.h:1.10 --- php4/ext/cpdf/php_cpdf.h:1.9 Tue Jun 19 17:25:52 2001 +++ php4/ext/cpdf/php_cpdf.h Sun Jul 29 21:56:21 2001 @@ -15,7 +15,7 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php_cpdf.h,v 1.9 2001/06/19 21:25:52 sbergmann Exp $ */ +/* $Id: php_cpdf.h,v 1.10 2001/07/30 01:56:21 zeev Exp $ */ #ifndef PHP_CPDF_H #define PHP_CPDF_H @@ -34,10 +34,10 @@ extern zend_module_entry cpdf_module_entry; #define cpdf_module_ptr &cpdf_module_entry -extern PHP_MINFO_FUNCTION(cpdf); -extern PHP_MINIT_FUNCTION(cpdf); -extern PHP_RINIT_FUNCTION(cpdf); -extern PHP_MSHUTDOWN_FUNCTION(cpdf); +PHP_MINFO_FUNCTION(cpdf); +PHP_MINIT_FUNCTION(cpdf); +PHP_RINIT_FUNCTION(cpdf); +PHP_MSHUTDOWN_FUNCTION(cpdf); PHP_FUNCTION(cpdf_global_set_document_limits); PHP_FUNCTION(cpdf_set_creator); PHP_FUNCTION(cpdf_set_title); Index: php4/ext/dbase/php_dbase.h diff -u php4/ext/dbase/php_dbase.h:1.7 php4/ext/dbase/php_dbase.h:1.8 --- php4/ext/dbase/php_dbase.h:1.7 Mon Feb 26 01:06:53 2001 +++ php4/ext/dbase/php_dbase.h Sun Jul 29 21:56:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dbase.h,v 1.7 2001/02/26 06:06:53 andi Exp $ */ +/* $Id: php_dbase.h,v 1.8 2001/07/30 01:56:21 zeev Exp $ */ #ifndef PHP_DBASE_H #define PHP_DBASE_H @@ -24,7 +24,7 @@ extern zend_module_entry dbase_module_entry; #define dbase_module_ptr &dbase_module_entry -extern PHP_MINIT_FUNCTION(dbase); +PHP_MINIT_FUNCTION(dbase); PHP_FUNCTION(dbase_open); PHP_FUNCTION(dbase_create); PHP_FUNCTION(dbase_close); Index: php4/ext/dbplus/dbplus.c diff -u php4/ext/dbplus/dbplus.c:1.1 php4/ext/dbplus/dbplus.c:1.2 --- php4/ext/dbplus/dbplus.c:1.1 Thu Jul 5 19:58:53 2001 +++ php4/ext/dbplus/dbplus.c Sun Jul 29 21:56:22 2001 @@ -134,10 +134,6 @@ PHP_MINIT_FUNCTION(dbplus) { -/* Remove comments if you have entries in php.ini - REGISTER_INI_ENTRIES(); -*/ - /* resource id for cdb connections */ le_dbplus_relation = zend_register_list_destructors_ex(dbplus_destruct_relation, NULL, "dbplus_relation", module_number); le_dbplus_tupel = zend_register_list_destructors_ex(dbplus_destruct_tupel , NULL, "dbplus_tuple" , module_number); Index: php4/ext/dbx/dbx.c diff -u php4/ext/dbx/dbx.c:1.17 php4/ext/dbx/dbx.c:1.18 --- php4/ext/dbx/dbx.c:1.17 Thu Jul 19 11:44:56 2001 +++ php4/ext/dbx/dbx.c Sun Jul 29 21:56:22 2001 @@ -468,9 +468,12 @@ for (col_index=0; col_index<rv_column_count->value.lval; ++col_index) { zend_hash_index_find((*inforow_ptr)->value.ht, col_index, (void **) &columnname_ptr); zend_hash_index_find((*row_ptr)->value.ht, col_index, (void **) &actual_ptr); - (*actual_ptr)->refcount+=1; - (*actual_ptr)->is_ref=1; - zend_hash_update((*row_ptr)->value.ht, (*columnname_ptr)->value.str.val, (*columnname_ptr)->value.str.len + 1, actual_ptr, sizeof(zval *), NULL); + (*actual_ptr)->refcount+=1; + + (*actual_ptr)->is_ref=1; + + zend_hash_update((*row_ptr)->value.ht, (*columnname_ptr)->value.str.val, (*columnname_ptr)->value.str.len + 1, actual_ptr, sizeof(zval *), NULL); + } } ++row_count; Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.41 php4/ext/domxml/php_domxml.c:1.42 --- php4/ext/domxml/php_domxml.c:1.41 Mon Jul 16 07:16:44 2001 +++ php4/ext/domxml/php_domxml.c Sun Jul 29 21:56:23 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.41 2001/07/16 11:16:44 joey Exp $ */ +/* $Id: php_domxml.c,v 1.42 2001/07/30 01:56:23 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -721,6 +721,7 @@ PHP_MINIT_FUNCTION(domxml) { zend_class_entry ce; + le_domxmldocp = zend_register_list_destructors_ex(php_free_xml_doc, NULL, "domdocument", module_number); /* Freeing the document contains freeing the complete tree. Therefore nodes, attributes etc. may not be freed seperately. @@ -736,53 +737,53 @@ /* le_domxmlnsp = register_list_destructors(NULL, NULL); */ INIT_OVERLOADED_CLASS_ENTRY(ce, "DomNode", php_domxmlnode_class_functions, NULL, NULL, NULL); - domxmlnode_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL); + domxmlnode_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomDocument", php_domxmldoc_class_functions, NULL, NULL, NULL); - domxmldoc_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmldoc_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomDocumentType", php_domxmldoctype_class_functions, NULL, NULL, NULL); - domxmldoctype_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmldoctype_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "Dtd", php_domxmldtd_class_functions, NULL, NULL, NULL); - domxmldtd_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmldtd_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomElement", php_domxmlelement_class_functions, NULL, NULL, NULL); - domxmlelement_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmlelement_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomAttribute", php_domxmlattr_class_functions, NULL, NULL, NULL); - domxmlattr_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmlattr_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomCData", php_domxmlcdata_class_functions, NULL, NULL, NULL); - domxmlcdata_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmlcdata_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomText", php_domxmltext_class_functions, NULL, NULL, NULL); - domxmltext_class_entry = zend_register_internal_class_ex(&ce, domxmlcdata_class_entry, NULL); + domxmltext_class_entry = zend_register_internal_class_ex(&ce, domxmlcdata_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomComment", php_domxmlcomment_class_functions, NULL, NULL, NULL); - domxmlcomment_class_entry = zend_register_internal_class_ex(&ce, domxmlcdata_class_entry, NULL); + domxmlcomment_class_entry = zend_register_internal_class_ex(&ce, domxmlcdata_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomProcessingInstruction", php_domxmlpi_class_functions, NULL, NULL, NULL); - domxmlpi_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmlpi_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomNotation", php_domxmlnotation_class_functions, NULL, NULL, NULL); - domxmlnotation_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmlnotation_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomEntity", php_domxmlentity_class_functions, NULL, NULL, NULL); - domxmlentity_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmlentity_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomEntityReference", php_domxmlentityref_class_functions, NULL, NULL, NULL); - domxmlentityref_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL); + domxmlentityref_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "DomNamespace", php_domxmlns_class_functions, NULL, NULL, NULL); - domxmlns_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL); + domxmlns_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); #if defined(LIBXML_XPATH_ENABLED) INIT_OVERLOADED_CLASS_ENTRY(ce, "XPathContext", php_xpathctx_class_functions, NULL, NULL, NULL); - xpathctx_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL); + xpathctx_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); INIT_OVERLOADED_CLASS_ENTRY(ce, "XPathObject", php_xpathobject_class_functions, NULL, NULL, NULL); - xpathobject_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL); + xpathobject_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); #endif REGISTER_LONG_CONSTANT("XML_ELEMENT_NODE", XML_ELEMENT_NODE, CONST_CS | CONST_PERSISTENT); Index: php4/ext/domxml/php_domxml.h diff -u php4/ext/domxml/php_domxml.h:1.25 php4/ext/domxml/php_domxml.h:1.26 --- php4/ext/domxml/php_domxml.h:1.25 Mon Apr 9 07:53:06 2001 +++ php4/ext/domxml/php_domxml.h Sun Jul 29 21:56:23 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.h,v 1.25 2001/04/09 11:53:06 steinm Exp $ */ +/* $Id: php_domxml.h,v 1.26 2001/07/30 01:56:23 zeev Exp $ */ #ifndef PHP_DOMXML_H #define PHP_DOMXML_H @@ -34,9 +34,9 @@ #define domxml_module_ptr &domxml_module_entry /* directory functions */ -extern PHP_MINIT_FUNCTION(domxml); -extern PHP_RINIT_FUNCTION(domxml); -extern PHP_MINFO_FUNCTION(domxml); +PHP_MINIT_FUNCTION(domxml); +PHP_RINIT_FUNCTION(domxml); +PHP_MINFO_FUNCTION(domxml); PHP_FUNCTION(domxml_version); PHP_FUNCTION(xmldoc); PHP_FUNCTION(xmldocfile); Index: php4/ext/dotnet/dotnet.cpp diff -u php4/ext/dotnet/dotnet.cpp:1.11 php4/ext/dotnet/dotnet.cpp:1.12 --- php4/ext/dotnet/dotnet.cpp:1.11 Sun Jun 24 17:20:22 2001 +++ php4/ext/dotnet/dotnet.cpp Sun Jul 29 21:56:24 2001 @@ -184,14 +184,16 @@ } } -void php_register_DOTNET_class() +void php_register_DOTNET_class(void) { + TSRMLS_FETCH(); + INIT_OVERLOADED_CLASS_ENTRY(dotnet_class_entry, "DOTNET", NULL, php_DOTNET_call_function_handler, php_COM_get_property_handler, php_COM_set_property_handler); - zend_register_internal_class(&dotnet_class_entry); + zend_register_internal_class(&dotnet_class_entry TSRMLS_CC); } function_entry DOTNET_functions[] = { @@ -207,7 +209,6 @@ PHP_MINIT_FUNCTION(DOTNET) { - HRESULT hr; CoInitialize(0); hr = dotnet_init(); Index: php4/ext/dotnet/php_dotnet.h diff -u php4/ext/dotnet/php_dotnet.h:1.1 php4/ext/dotnet/php_dotnet.h:1.2 --- php4/ext/dotnet/php_dotnet.h:1.1 Sat Aug 26 08:53:13 2000 +++ php4/ext/dotnet/php_dotnet.h Sun Jul 29 21:56:24 2001 @@ -3,8 +3,8 @@ #if WIN32|WINNT -extern PHP_MINIT_FUNCTION(DOTNET); -extern PHP_MSHUTDOWN_FUNCTION(DOTNET); +PHP_MINIT_FUNCTION(DOTNET); +PHP_MSHUTDOWN_FUNCTION(DOTNET); PHP_FUNCTION(DOTNET_load); extern zend_module_entry DOTNET_module_entry; Index: php4/ext/fbsql/php_fbsql.h diff -u php4/ext/fbsql/php_fbsql.h:1.8 php4/ext/fbsql/php_fbsql.h:1.9 --- php4/ext/fbsql/php_fbsql.h:1.8 Sat Jul 28 07:35:49 2001 +++ php4/ext/fbsql/php_fbsql.h Sun Jul 29 21:56:24 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.h,v 1.8 2001/07/28 11:35:49 zeev Exp $ */ +/* $Id: php_fbsql.h,v 1.9 2001/07/30 01:56:24 zeev Exp $ */ #define HAVE_FBSQL 1 @@ -34,10 +34,10 @@ #include <FBCAccess/FBCAccess.h> -extern PHP_MINIT_FUNCTION(fbsql); -extern PHP_MSHUTDOWN_FUNCTION(fbsql); -extern PHP_RINIT_FUNCTION(fbsql); -extern PHP_RSHUTDOWN_FUNCTION(fbsql); +PHP_MINIT_FUNCTION(fbsql); +PHP_MSHUTDOWN_FUNCTION(fbsql); +PHP_RINIT_FUNCTION(fbsql); +PHP_RSHUTDOWN_FUNCTION(fbsql); PHP_MINFO_FUNCTION(fbsql); PHP_FUNCTION(fbsql_connect); PHP_FUNCTION(fbsql_pconnect); Index: php4/ext/filepro/php_filepro.h diff -u php4/ext/filepro/php_filepro.h:1.6 php4/ext/filepro/php_filepro.h:1.7 --- php4/ext/filepro/php_filepro.h:1.6 Mon Feb 26 01:06:55 2001 +++ php4/ext/filepro/php_filepro.h Sun Jul 29 21:56:24 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_filepro.h,v 1.6 2001/02/26 06:06:55 andi Exp $ */ +/* $Id: php_filepro.h,v 1.7 2001/07/30 01:56:24 zeev Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -40,8 +40,8 @@ PHP_FUNCTION(filepro_fieldcount); PHP_FUNCTION(filepro_retrieve); -extern PHP_MINIT_FUNCTION(filepro); -extern PHP_MSHUTDOWN_FUNCTION(filepro); +PHP_MINIT_FUNCTION(filepro); +PHP_MSHUTDOWN_FUNCTION(filepro); #else #define phpext_filepro_ptr NULL #endif Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.31 php4/ext/gd/php_gd.h:1.32 --- php4/ext/gd/php_gd.h:1.31 Thu Jul 5 17:23:28 2001 +++ php4/ext/gd/php_gd.h Sun Jul 29 21:56:24 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_gd.h,v 1.31 2001/07/05 21:23:28 wez Exp $ */ +/* $Id: php_gd.h,v 1.32 2001/07/30 01:56:24 zeev Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -62,8 +62,8 @@ /* gd.c functions */ PHP_MINFO_FUNCTION(gd); -extern PHP_MINIT_FUNCTION(gd); -extern PHP_MSHUTDOWN_FUNCTION(gd); +PHP_MINIT_FUNCTION(gd); +PHP_MSHUTDOWN_FUNCTION(gd); #ifndef HAVE_GDIMAGECOLORRESOLVE static int gdImageColorResolve(gdImagePtr, int, int, int); Index: php4/ext/gmp/gmp.c diff -u php4/ext/gmp/gmp.c:1.12 php4/ext/gmp/gmp.c:1.13 --- php4/ext/gmp/gmp.c:1.12 Wed Jun 6 13:52:03 2001 +++ php4/ext/gmp/gmp.c Sun Jul 29 21:56:25 2001 @@ -137,9 +137,6 @@ */ ZEND_MINIT_FUNCTION(gmp) { -/* Remove comments if you have entries in php.ini - REGISTER_INI_ENTRIES(); -*/ le_gmp = zend_register_list_destructors_ex(_php_gmpnum_free, NULL, GMP_RESOURCE_NAME, module_number); Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.85 php4/ext/hyperwave/hw.c:1.86 --- php4/ext/hyperwave/hw.c:1.85 Sat Jul 28 07:35:52 2001 +++ php4/ext/hyperwave/hw.c Sun Jul 29 21:56:25 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.85 2001/07/28 11:35:52 zeev Exp $ */ +/* $Id: hw.c,v 1.86 2001/07/30 01:56:25 zeev Exp $ */ #include <stdlib.h> #include <errno.h> @@ -211,7 +211,8 @@ PHP_INI_ENTRY("hyperwave.default_port", "418", PHP_INI_ALL, OnHyperwavePort) PHP_INI_END() -PHP_MINIT_FUNCTION(hw) { +PHP_MINIT_FUNCTION(hw) +{ ZEND_INIT_MODULE_GLOBALS(hw, php_hw_init_globals, NULL); REGISTER_INI_ENTRIES(); Index: php4/ext/hyperwave/php_hyperwave.h diff -u php4/ext/hyperwave/php_hyperwave.h:1.15 php4/ext/hyperwave/php_hyperwave.h:1.16 --- php4/ext/hyperwave/php_hyperwave.h:1.15 Sat Jul 28 07:35:52 2001 +++ php4/ext/hyperwave/php_hyperwave.h Sun Jul 29 21:56:26 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_hyperwave.h,v 1.15 2001/07/28 11:35:52 zeev Exp $ */ +/* $Id: php_hyperwave.h,v 1.16 2001/07/30 01:56:26 zeev Exp $ */ #ifndef PHP_HYPERWAVE_H #define PHP_HYPERWAVE_H @@ -65,8 +65,8 @@ char *bodytag; } hw_document; -extern PHP_MINIT_FUNCTION(hw); -extern PHP_MSHUTDOWN_FUNCTION(hw); +PHP_MINIT_FUNCTION(hw); +PHP_MSHUTDOWN_FUNCTION(hw); PHP_MINFO_FUNCTION(hw); PHP_FUNCTION(hw_connect); Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.24 php4/ext/icap/php_icap.c:1.25 --- php4/ext/icap/php_icap.c:1.24 Wed Jun 6 10:32:23 2001 +++ php4/ext/icap/php_icap.c Sun Jul 29 21:56:26 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_icap.c,v 1.24 2001/06/06 14:32:23 rasmus Exp $ */ +/* $Id: php_icap.c,v 1.25 2001/07/30 01:56:26 zeev Exp $ */ #define ICAP1 @@ -130,9 +130,7 @@ PHP_MINIT_FUNCTION(icap) { - le_icap = zend_register_list_destructors_ex(cal_close_it, NULL, "icap", module_number); - return SUCCESS; } Index: php4/ext/icap/php_icap.h diff -u php4/ext/icap/php_icap.h:1.5 php4/ext/icap/php_icap.h:1.6 --- php4/ext/icap/php_icap.h:1.5 Sun Jul 2 20:41:15 2000 +++ php4/ext/icap/php_icap.h Sun Jul 29 21:56:27 2001 @@ -1,4 +1,4 @@ -/* $Id: php_icap.h,v 1.5 2000/07/03 00:41:15 sas Exp $ */ +/* $Id: php_icap.h,v 1.6 2001/07/30 01:56:27 zeev Exp $ */ #ifndef PHP_ICAP_H #define PHP_ICAP_H @@ -9,7 +9,7 @@ #include "build-defs.h" #endif -extern PHP_MINIT_FUNCTION(icap); +PHP_MINIT_FUNCTION(icap); PHP_MINFO_FUNCTION(icap); /* Functions accessable to PHP */ Index: php4/ext/iisfunc/setup.h diff -u php4/ext/iisfunc/setup.h:1.2 php4/ext/iisfunc/setup.h:1.3 --- php4/ext/iisfunc/setup.h:1.2 Mon Feb 26 01:06:58 2001 +++ php4/ext/iisfunc/setup.h Sun Jul 29 21:56:28 2001 @@ -15,7 +15,7 @@ | Authors: Frank M. Kromann <fmk@swwwing.com> | +----------------------------------------------------------------------+ */ -/* $Id: setup.h,v 1.2 2001/02/26 06:06:58 andi Exp $ */ +/* $Id: setup.h,v 1.3 2001/07/30 01:56:28 zeev Exp $ */ #ifndef PHP_IIS_SETUP_H #define PHP_IIS_SETUP_H @@ -35,10 +35,10 @@ extern zend_module_entry iisfunc_module_entry; #define iisfunc_module_ptr &iisfunc_module_entry -extern PHP_MINIT_FUNCTION(iisfunc); -extern PHP_MSHUTDOWN_FUNCTION(iisfunc); -extern PHP_RINIT_FUNCTION(iisfunc); -extern PHP_RSHUTDOWN_FUNCTION(iisfunc); +PHP_MINIT_FUNCTION(iisfunc); +PHP_MSHUTDOWN_FUNCTION(iisfunc); +PHP_RINIT_FUNCTION(iisfunc); +PHP_RSHUTDOWN_FUNCTION(iisfunc); PHP_MINFO_FUNCTION(iisfunc); PHP_FUNCTION(iis_getserverbypath); Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.59 php4/ext/interbase/interbase.c:1.60 --- php4/ext/interbase/interbase.c:1.59 Sat Jul 28 07:35:56 2001 +++ php4/ext/interbase/interbase.c Sun Jul 29 21:56:28 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.59 2001/07/28 11:35:56 zeev Exp $ */ +/* $Id: interbase.c,v 1.60 2001/07/30 01:56:28 zeev Exp $ */ /* TODO: Arrays, roles? @@ -494,8 +494,6 @@ PHP_MINIT_FUNCTION(ibase) { - TSRMLS_FETCH(); - ZEND_INIT_MODULE_GLOBALS(ibase, php_ibase_init_globals, NULL); REGISTER_INI_ENTRIES(); @@ -585,7 +583,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.59 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.60 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif Index: php4/ext/interbase/php_interbase.h diff -u php4/ext/interbase/php_interbase.h:1.21 php4/ext/interbase/php_interbase.h:1.22 --- php4/ext/interbase/php_interbase.h:1.21 Sat Jul 28 07:35:56 2001 +++ php4/ext/interbase/php_interbase.h Sun Jul 29 21:56:28 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_interbase.h,v 1.21 2001/07/28 11:35:56 zeev Exp $ */ +/* $Id: php_interbase.h,v 1.22 2001/07/30 01:56:28 zeev Exp $ */ #ifndef PHP_INTERBASE_H #define PHP_INTERBASE_H @@ -34,10 +34,10 @@ #define PHP_IBASE_API #endif -extern PHP_MINIT_FUNCTION(ibase); -extern PHP_RINIT_FUNCTION(ibase); -extern PHP_MSHUTDOWN_FUNCTION(ibase); -extern PHP_RSHUTDOWN_FUNCTION(ibase); +PHP_MINIT_FUNCTION(ibase); +PHP_RINIT_FUNCTION(ibase); +PHP_MSHUTDOWN_FUNCTION(ibase); +PHP_RSHUTDOWN_FUNCTION(ibase); PHP_MINFO_FUNCTION(ibase); PHP_FUNCTION(ibase_connect); Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.49 php4/ext/java/java.c:1.50 --- php4/ext/java/java.c:1.49 Sat Jul 28 07:35:57 2001 +++ php4/ext/java/java.c Sun Jul 29 21:56:28 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.49 2001/07/28 11:35:57 zeev Exp $ */ +/* $Id: java.c,v 1.50 2001/07/30 01:56:28 zeev Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -604,13 +604,14 @@ } #endif -PHP_MINIT_FUNCTION(java) { +PHP_MINIT_FUNCTION(java) +{ INIT_OVERLOADED_CLASS_ENTRY(java_class_entry, "java", NULL, java_call_function_handler, java_get_property_handler, java_set_property_handler); - zend_register_internal_class(&java_class_entry); + zend_register_internal_class(&java_class_entry TSRMLS_CC); le_jobject = zend_register_list_destructors_ex(_php_java_destructor, NULL, "java", module_number); Index: php4/ext/mbstring/mbstring.h diff -u php4/ext/mbstring/mbstring.h:1.6 php4/ext/mbstring/mbstring.h:1.7 --- php4/ext/mbstring/mbstring.h:1.6 Sat Jul 28 07:35:58 2001 +++ php4/ext/mbstring/mbstring.h Sun Jul 29 21:56:29 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.h,v 1.6 2001/07/28 11:35:58 zeev Exp $ */ +/* $Id: mbstring.h,v 1.7 2001/07/30 01:56:29 zeev Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -58,10 +58,10 @@ extern zend_module_entry mbstring_module_entry; #define mbstring_module_ptr &mbstring_module_entry -extern PHP_MINIT_FUNCTION(mbstring); -extern PHP_MSHUTDOWN_FUNCTION(mbstring); -extern PHP_RINIT_FUNCTION(mbstring); -extern PHP_RSHUTDOWN_FUNCTION(mbstring); +PHP_MINIT_FUNCTION(mbstring); +PHP_MSHUTDOWN_FUNCTION(mbstring); +PHP_RINIT_FUNCTION(mbstring); +PHP_RSHUTDOWN_FUNCTION(mbstring); PHP_MINFO_FUNCTION(mbstring); /* php function registration */ Index: php4/ext/mcal/php_mcal.h diff -u php4/ext/mcal/php_mcal.h:1.9 php4/ext/mcal/php_mcal.h:1.10 --- php4/ext/mcal/php_mcal.h:1.9 Sun Jul 2 20:41:16 2000 +++ php4/ext/mcal/php_mcal.h Sun Jul 29 21:56:29 2001 @@ -1,4 +1,4 @@ -/* $Id: php_mcal.h,v 1.9 2000/07/03 00:41:16 sas Exp $ */ +/* $Id: php_mcal.h,v 1.10 2001/07/30 01:56:29 zeev Exp $ */ #ifndef PHP_MCAL_H #define PHP_MCAL_H @@ -16,11 +16,11 @@ #define phpext_mcal_ptr php_mcal_module_ptr #ifdef ZEND_VERSION -extern PHP_MINIT_FUNCTION(mcal); +PHP_MINIT_FUNCTION(mcal); PHP_MINFO_FUNCTION(mcal); #else -extern int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS); -extern void PHP_MINFO_FUNCTION(void); +int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS); +void PHP_MINFO_FUNCTION(void); #endif Index: php4/ext/ming/ming.c diff -u php4/ext/ming/ming.c:1.9 php4/ext/ming/ming.c:1.10 --- php4/ext/ming/ming.c:1.9 Wed Jun 6 09:05:46 2001 +++ php4/ext/ming/ming.c Sun Jul 29 21:56:29 2001 @@ -3015,19 +3015,19 @@ INIT_CLASS_ENTRY(morph_class_entry, "swfmorph", swfmorph_functions); INIT_CLASS_ENTRY(sprite_class_entry, "swfsprite", swfsprite_functions); - zend_register_internal_class(&shape_class_entry); - zend_register_internal_class(&fill_class_entry); - zend_register_internal_class(&gradient_class_entry); - zend_register_internal_class(&bitmap_class_entry); - zend_register_internal_class(&text_class_entry); - zend_register_internal_class(&textfield_class_entry); - zend_register_internal_class(&font_class_entry); - zend_register_internal_class(&displayitem_class_entry); - zend_register_internal_class(&movie_class_entry); - zend_register_internal_class(&button_class_entry); - zend_register_internal_class(&action_class_entry); - zend_register_internal_class(&morph_class_entry); - zend_register_internal_class(&sprite_class_entry); + zend_register_internal_class(&shape_class_entry TSRMLS_CC); + zend_register_internal_class(&fill_class_entry TSRMLS_CC); + zend_register_internal_class(&gradient_class_entry TSRMLS_CC); + zend_register_internal_class(&bitmap_class_entry TSRMLS_CC); + zend_register_internal_class(&text_class_entry TSRMLS_CC); + zend_register_internal_class(&textfield_class_entry TSRMLS_CC); + zend_register_internal_class(&font_class_entry TSRMLS_CC); + zend_register_internal_class(&displayitem_class_entry TSRMLS_CC); + zend_register_internal_class(&movie_class_entry TSRMLS_CC); + zend_register_internal_class(&button_class_entry TSRMLS_CC); + zend_register_internal_class(&action_class_entry TSRMLS_CC); + zend_register_internal_class(&morph_class_entry TSRMLS_CC); + zend_register_internal_class(&sprite_class_entry TSRMLS_CC); return SUCCESS; } Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.57 php4/ext/mssql/php_mssql.c:1.58 --- php4/ext/mssql/php_mssql.c:1.57 Sat Jul 28 07:36:00 2001 +++ php4/ext/mssql/php_mssql.c Sun Jul 29 21:56:29 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.57 2001/07/28 11:36:00 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.58 2001/07/30 01:56:29 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -232,7 +232,7 @@ TSRMLS_FETCH(); mssql_ptr->valid = 0; - zend_hash_apply(&EG(regular_list),(int (*)(void *))_clean_invalid_results); + zend_hash_apply(&EG(regular_list),(apply_func_t) _clean_invalid_results); dbclose(mssql_ptr->link); dbfreelogin(mssql_ptr->login); efree(mssql_ptr); Index: php4/ext/mssql/php_mssql.h diff -u php4/ext/mssql/php_mssql.h:1.15 php4/ext/mssql/php_mssql.h:1.16 --- php4/ext/mssql/php_mssql.h:1.15 Sat Jul 28 07:36:00 2001 +++ php4/ext/mssql/php_mssql.h Sun Jul 29 21:56:30 2001 @@ -17,7 +17,7 @@ */ -/* $Id: php_mssql.h,v 1.15 2001/07/28 11:36:00 zeev Exp $ */ +/* $Id: php_mssql.h,v 1.16 2001/07/30 01:56:30 zeev Exp $ */ #ifndef PHP_MSSQL_H #define PHP_MSSQL_H @@ -50,10 +50,10 @@ extern zend_module_entry mssql_module_entry; #define mssql_module_ptr &mssql_module_entry -extern PHP_MINIT_FUNCTION(mssql); -extern PHP_MSHUTDOWN_FUNCTION(mssql); -extern PHP_RINIT_FUNCTION(mssql); -extern PHP_RSHUTDOWN_FUNCTION(mssql); +PHP_MINIT_FUNCTION(mssql); +PHP_MSHUTDOWN_FUNCTION(mssql); +PHP_RINIT_FUNCTION(mssql); +PHP_RSHUTDOWN_FUNCTION(mssql); PHP_MINFO_FUNCTION(mssql); PHP_FUNCTION(mssql_connect); Index: php4/ext/mysql/php_mysql.h diff -u php4/ext/mysql/php_mysql.h:1.22 php4/ext/mysql/php_mysql.h:1.23 --- php4/ext/mysql/php_mysql.h:1.22 Sat Jul 28 07:36:02 2001 +++ php4/ext/mysql/php_mysql.h Sun Jul 29 21:56:30 2001 @@ -17,7 +17,7 @@ */ -/* $Id: php_mysql.h,v 1.22 2001/07/28 11:36:02 zeev Exp $ */ +/* $Id: php_mysql.h,v 1.23 2001/07/30 01:56:30 zeev Exp $ */ #ifndef PHP_MYSQL_H #define PHP_MYSQL_H @@ -38,10 +38,10 @@ #define mysql_module_ptr &mysql_module_entry -extern PHP_MINIT_FUNCTION(mysql); -extern PHP_RINIT_FUNCTION(mysql); -extern PHP_MSHUTDOWN_FUNCTION(mysql); -extern PHP_RSHUTDOWN_FUNCTION(mysql); +PHP_MINIT_FUNCTION(mysql); +PHP_RINIT_FUNCTION(mysql); +PHP_MSHUTDOWN_FUNCTION(mysql); +PHP_RSHUTDOWN_FUNCTION(mysql); PHP_MINFO_FUNCTION(mysql); PHP_FUNCTION(mysql_connect); Index: php4/ext/ncurses/ncurses.c diff -u php4/ext/ncurses/ncurses.c:1.1 php4/ext/ncurses/ncurses.c:1.2 --- php4/ext/ncurses/ncurses.c:1.1 Tue Jun 12 17:15:49 2001 +++ php4/ext/ncurses/ncurses.c Sun Jul 29 21:56:32 2001 @@ -75,10 +75,6 @@ */ PHP_MINIT_FUNCTION(ncurses) { -/* Remove comments if you have entries in php.ini - REGISTER_INI_ENTRIES(); -*/ - PHP_NCURSES_CONST(COLOR_BLACK); PHP_NCURSES_CONST(COLOR_RED); PHP_NCURSES_CONST(COLOR_GREEN); Index: php4/ext/notes/php_notes.h diff -u php4/ext/notes/php_notes.h:1.2 php4/ext/notes/php_notes.h:1.3 --- php4/ext/notes/php_notes.h:1.2 Mon Feb 26 01:07:08 2001 +++ php4/ext/notes/php_notes.h Sun Jul 29 21:56:32 2001 @@ -17,16 +17,16 @@ */ -/* $Id: php_notes.h,v 1.2 2001/02/26 06:07:08 andi Exp $ */ +/* $Id: php_notes.h,v 1.3 2001/07/30 01:56:32 zeev Exp $ */ extern zend_module_entry notes_module_entry; #define notes_module_ptr &notes_module_entry -extern PHP_MINIT_FUNCTION(notes); -extern PHP_MSHUTDOWN_FUNCTION(notes); -extern PHP_RINIT_FUNCTION(notes); -extern PHP_RSHUTDOWN_FUNCTION(notes); +PHP_MINIT_FUNCTION(notes); +PHP_MSHUTDOWN_FUNCTION(notes); +PHP_RINIT_FUNCTION(notes); +PHP_RSHUTDOWN_FUNCTION(notes); PHP_MINFO_FUNCTION(notes); PHP_FUNCTION(notes_create_db); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.138 php4/ext/oci8/oci8.c:1.139 --- php4/ext/oci8/oci8.c:1.138 Sat Jul 28 07:36:03 2001 +++ php4/ext/oci8/oci8.c Sun Jul 29 21:56:32 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.138 2001/07/28 11:36:03 zeev Exp $ */ +/* $Id: oci8.c,v 1.139 2001/07/30 01:56:32 zeev Exp $ */ /* TODO list: * @@ -452,9 +452,9 @@ INIT_CLASS_ENTRY(oci_coll_class_entry, "OCI-Collection", php_oci_coll_class_functions); #endif - oci_lob_class_entry_ptr = zend_register_internal_class(&oci_lob_class_entry); + oci_lob_class_entry_ptr = zend_register_internal_class(&oci_lob_class_entry TSRMLS_CC); #ifdef WITH_COLLECTIONS - oci_coll_class_entry_ptr = zend_register_internal_class(&oci_coll_class_entry); + oci_coll_class_entry_ptr = zend_register_internal_class(&oci_coll_class_entry TSRMLS_CC); #endif /* thies@thieso.net 990203 i do not think that we will need all of them - just in here for completeness for now! */ @@ -541,8 +541,8 @@ oci_debug("START php_mshutdown_oci"); - zend_hash_apply(OCI(user),(int (*)(void *))_session_pcleanup); - zend_hash_apply(OCI(server),(int (*)(void *))_server_pcleanup); + zend_hash_apply(OCI(user), (apply_func_t)_session_pcleanup); + zend_hash_apply(OCI(server), (apply_func_t)_server_pcleanup); zend_hash_destroy(OCI(user)); zend_hash_destroy(OCI(server)); @@ -564,8 +564,8 @@ #if 0 /* XXX free all statements, rollback all outstanding transactions */ - zend_hash_apply(OCI(user),(int (*)(void *))_session_cleanup); - zend_hash_apply(OCI(server),(int (*)(void *))_server_cleanup); + zend_hash_apply(OCI(user), (apply_func_t) _session_cleanup); + zend_hash_apply(OCI(server), (apply_func_t) _server_cleanup); #endif oci_debug("END php_rshutdown_oci"); @@ -579,7 +579,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.138 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.139 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -1348,7 +1348,7 @@ we don't want to execute!!! */ if (statement->binds) { - zend_hash_apply(statement->binds, (int (*)(void *)) _oci_bind_pre_exec); + zend_hash_apply(statement->binds, (apply_func_t) _oci_bind_pre_exec); } statement->error = @@ -1363,7 +1363,7 @@ NULL, mode)); if (statement->binds) { - zend_hash_apply(statement->binds, (int (*)(void *)) _oci_bind_post_exec); + zend_hash_apply(statement->binds, (apply_func_t) _oci_bind_post_exec); } oci_handle_error(statement->conn, statement->error); @@ -1633,7 +1633,7 @@ oci_out_column *column; if (statement->columns) { - zend_hash_apply(statement->columns, (int (*)(void *)) _oci_column_pre_fetch); + zend_hash_apply(statement->columns, (apply_func_t) _oci_column_pre_fetch); } statement->error = @@ -2363,7 +2363,7 @@ oldopen = server->is_open; server->is_open = 2; if (! OCI(shutdown)) { - zend_hash_apply(&EG(regular_list),_oci_session_cleanup); + zend_hash_apply(&EG(regular_list), _oci_session_cleanup); } server->is_open = oldopen; @@ -3919,7 +3919,7 @@ connection->is_open = 0; - zend_hash_apply(list,(int (*)(void *))_stmt_cleanup); + zend_hash_apply(list, (apply_func_t) _stmt_cleanup); if (zend_list_delete(connection->id) == SUCCESS) { RETURN_TRUE; Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.39 php4/ext/odbc/php_odbc.h:1.40 --- php4/ext/odbc/php_odbc.h:1.39 Sat Jul 28 07:36:04 2001 +++ php4/ext/odbc/php_odbc.h Sun Jul 29 21:56:33 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.39 2001/07/28 11:36:04 zeev Exp $ */ +/* $Id: php_odbc.h,v 1.40 2001/07/30 01:56:33 zeev Exp $ */ #ifndef PHP_ODBC_H #define PHP_ODBC_H @@ -186,10 +186,10 @@ /* user functions */ -extern PHP_MINIT_FUNCTION(odbc); -extern PHP_MSHUTDOWN_FUNCTION(odbc); -extern PHP_RINIT_FUNCTION(odbc); -extern PHP_RSHUTDOWN_FUNCTION(odbc); +PHP_MINIT_FUNCTION(odbc); +PHP_MSHUTDOWN_FUNCTION(odbc); +PHP_RINIT_FUNCTION(odbc); +PHP_RSHUTDOWN_FUNCTION(odbc); PHP_MINFO_FUNCTION(odbc); PHP_FUNCTION(odbc_error); Index: php4/ext/odbc/php_velocis.h diff -u php4/ext/odbc/php_velocis.h:1.7 php4/ext/odbc/php_velocis.h:1.8 --- php4/ext/odbc/php_velocis.h:1.7 Mon Feb 26 01:07:09 2001 +++ php4/ext/odbc/php_velocis.h Sun Jul 29 21:56:33 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_velocis.h,v 1.7 2001/02/26 06:07:09 andi Exp $ */ +/* $Id: php_velocis.h,v 1.8 2001/07/30 01:56:33 zeev Exp $ */ #ifndef PHP_VELOCIS_H #define PHP_VELOCIS_H @@ -57,10 +57,10 @@ #define velocis_module_ptr &velocis_module_entry /* velocis.c functions */ -extern PHP_MINIT_FUNCTION(velocis); -extern PHP_RINIT_FUNCTION(velocis); +PHP_MINIT_FUNCTION(velocis); +PHP_RINIT_FUNCTION(velocis); PHP_MINFO_FUNCTION(velocis); -extern PHP_MSHUTDOWN_FUNCTION(velocis); +PHP_MSHUTDOWN_FUNCTION(velocis); PHP_FUNCTION(velocis_connect); PHP_FUNCTION(velocis_close); Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.25 php4/ext/odbc/velocis.c:1.26 --- php4/ext/odbc/velocis.c:1.25 Thu May 24 06:07:15 2001 +++ php4/ext/odbc/velocis.c Sun Jul 29 21:56:33 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.25 2001/05/24 10:07:15 ssb Exp $ */ +/* $Id: velocis.c,v 1.26 2001/07/30 01:56:33 zeev Exp $ */ /* * TODO: @@ -104,6 +104,7 @@ PHP_MINIT_FUNCTION(velocis) { SQLAllocEnv(&henv); + if ( cfg_get_long("velocis.max_links",&php_velocis_module.max_links) == FAILURE ) { php_velocis_module.max_links = -1; } Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.66 php4/ext/oracle/oracle.c:1.67 --- php4/ext/oracle/oracle.c:1.66 Sat Jul 28 07:36:05 2001 +++ php4/ext/oracle/oracle.c Sun Jul 29 21:56:34 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.66 2001/07/28 11:36:05 zeev Exp $ */ +/* $Id: oracle.c,v 1.67 2001/07/30 01:56:34 zeev Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -317,7 +317,6 @@ */ PHP_MINIT_FUNCTION(oracle) { - #ifdef ZTS ts_allocate_id(&ora_globals_id, sizeof(php_ora_globals), (ts_allocate_ctor) php_ora_init_globals, NULL); #else Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.103 php4/ext/pcre/php_pcre.c:1.104 --- php4/ext/pcre/php_pcre.c:1.103 Sat Jul 28 07:36:06 2001 +++ php4/ext/pcre/php_pcre.c Sun Jul 29 21:56:34 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.103 2001/07/28 11:36:06 zeev Exp $ */ +/* $Id: php_pcre.c,v 1.104 2001/07/30 01:56:34 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -661,7 +661,7 @@ smart_str_appendl(&code, segment, walk - segment); smart_str_0(&code); - compiled_string_description = zend_make_compiled_string_description("regexp code"); + compiled_string_description = zend_make_compiled_string_description("regexp code" TSRMLS_CC); /* Run the code */ if (zend_eval_string(code.c, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { efree(compiled_string_description); Index: php4/ext/pdf/php_pdf.h diff -u php4/ext/pdf/php_pdf.h:1.17 php4/ext/pdf/php_pdf.h:1.18 --- php4/ext/pdf/php_pdf.h:1.17 Sat Jul 28 07:36:07 2001 +++ php4/ext/pdf/php_pdf.h Sun Jul 29 21:56:35 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pdf.h,v 1.17 2001/07/28 11:36:07 zeev Exp $ */ +/* $Id: php_pdf.h,v 1.18 2001/07/30 01:56:35 zeev Exp $ */ #ifndef PHP_PDF_H #define PHP_PDF_H @@ -32,9 +32,9 @@ extern zend_module_entry pdf_module_entry; #define pdf_module_ptr &pdf_module_entry -extern PHP_MINFO_FUNCTION(pdf); -extern PHP_MINIT_FUNCTION(pdf); -extern PHP_MSHUTDOWN_FUNCTION(pdf); +PHP_MINFO_FUNCTION(pdf); +PHP_MINIT_FUNCTION(pdf); +PHP_MSHUTDOWN_FUNCTION(pdf); PHP_FUNCTION(pdf_new); /* new function */ PHP_FUNCTION(pdf_delete); /* new function */ PHP_FUNCTION(pdf_open_file); Index: php4/ext/qtdom/qtdom.c diff -u php4/ext/qtdom/qtdom.c:1.6 php4/ext/qtdom/qtdom.c:1.7 --- php4/ext/qtdom/qtdom.c:1.6 Wed Jun 6 09:05:50 2001 +++ php4/ext/qtdom/qtdom.c Sun Jul 29 21:56:35 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: qtdom.c,v 1.6 2001/06/06 13:05:50 rasmus Exp $ */ +/* $Id: qtdom.c,v 1.7 2001/07/30 01:56:35 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -71,17 +71,14 @@ */ PHP_MINIT_FUNCTION(qtdom) { -/* Remove comments if you have entries in php.ini - REGISTER_INI_ENTRIES(); -*/ zend_class_entry qdomdoc_class_entry; zend_class_entry qdomnode_class_entry; INIT_CLASS_ENTRY(qdomdoc_class_entry, "QDomDocument", qdomdoc_class_functions); INIT_CLASS_ENTRY(qdomnode_class_entry, "QDomNode", qdomnode_class_functions); - qdomdoc_class_entry_ptr = zend_register_internal_class(&qdomdoc_class_entry); - qdomnode_class_entry_ptr = zend_register_internal_class(&qdomnode_class_entry); + qdomdoc_class_entry_ptr = zend_register_internal_class(&qdomdoc_class_entry TSRMLS_CC); + qdomnode_class_entry_ptr = zend_register_internal_class(&qdomnode_class_entry TSRMLS_CC); qdom_init(); Index: php4/ext/recode/php_recode.h diff -u php4/ext/recode/php_recode.h:1.8 php4/ext/recode/php_recode.h:1.9 --- php4/ext/recode/php_recode.h:1.8 Sat Jul 28 07:36:11 2001 +++ php4/ext/recode/php_recode.h Sun Jul 29 21:56:35 2001 @@ -17,7 +17,7 @@ */ -/* $Id: php_recode.h,v 1.8 2001/07/28 11:36:11 zeev Exp $ */ +/* $Id: php_recode.h,v 1.9 2001/07/30 01:56:35 zeev Exp $ */ #ifndef PHP_RECODE_H #define PHP_RECODE_H @@ -54,12 +54,12 @@ extern zend_module_entry recode_module_entry; #define phpext_recode_ptr &recode_module_entry -extern PHP_MINIT_FUNCTION(recode); -extern PHP_MSHUTDOWN_FUNCTION(recode); -extern PHP_MINFO_FUNCTION(recode); +PHP_MINIT_FUNCTION(recode); +PHP_MSHUTDOWN_FUNCTION(recode); +PHP_MINFO_FUNCTION(recode); -extern PHP_FUNCTION(recode_string); -extern PHP_FUNCTION(recode_file); +PHP_FUNCTION(recode_string); +PHP_FUNCTION(recode_file); typedef struct { RECODE_OUTER outer; Index: php4/ext/recode/recode.c diff -u php4/ext/recode/recode.c:1.14 php4/ext/recode/recode.c:1.15 --- php4/ext/recode/recode.c:1.14 Sat Jul 28 07:36:11 2001 +++ php4/ext/recode/recode.c Sun Jul 29 21:56:35 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.14 2001/07/28 11:36:11 zeev Exp $ */ +/* $Id: recode.c,v 1.15 2001/07/30 01:56:35 zeev Exp $ */ /* {{{ includes & prototypes */ @@ -74,8 +74,6 @@ PHP_MINIT_FUNCTION(recode) { - TSRMLS_FETCH(); - ReSG(outer) = recode_new_outer(true); if (ReSG(outer) == NULL) return FAILURE; @@ -101,7 +99,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.14 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.15 $"); php_info_print_table_end(); } Index: php4/ext/satellite/class.h diff -u php4/ext/satellite/class.h:1.4 php4/ext/satellite/class.h:1.5 --- php4/ext/satellite/class.h:1.4 Mon Feb 26 01:07:15 2001 +++ php4/ext/satellite/class.h Sun Jul 29 21:56:36 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: class.h,v 1.4 2001/02/26 06:07:15 andi Exp $ + * $Id: class.h,v 1.5 2001/07/30 01:56:36 zeev Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -168,7 +168,7 @@ putproperty \ ); \ \ - zend_register_internal_class(&name##_class_entry);\ + zend_register_internal_class(&name##_class_entry TSRMLS_CC);\ return TRUE;\ } Index: php4/ext/satellite/php_orbit.h diff -u php4/ext/satellite/php_orbit.h:1.3 php4/ext/satellite/php_orbit.h:1.4 --- php4/ext/satellite/php_orbit.h:1.3 Mon Feb 26 01:07:15 2001 +++ php4/ext/satellite/php_orbit.h Sun Jul 29 21:56:36 2001 @@ -17,26 +17,26 @@ */ /* - * $Id: php_orbit.h,v 1.3 2001/02/26 06:07:15 andi Exp $ + * $Id: php_orbit.h,v 1.4 2001/07/30 01:56:36 zeev Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ #ifndef _PHP_ORBIT_H #define _PHP_ORBIT_H -extern PHP_MINIT_FUNCTION(satellite); -extern PHP_MSHUTDOWN_FUNCTION(satellite); +PHP_MINIT_FUNCTION(satellite); +PHP_MSHUTDOWN_FUNCTION(satellite); extern zend_module_entry satellite_module_entry; #define satellite_module_ptr &satellite_module_entry #define phpext_satellite_ptr satellite_module_ptr -extern PHP_FUNCTION(satellite_load_idl); -extern PHP_FUNCTION(satellite_get_repository_id); +PHP_FUNCTION(satellite_load_idl); +PHP_FUNCTION(satellite_get_repository_id); /* exception handling */ -extern PHP_FUNCTION(satellite_caught_exception); -extern PHP_FUNCTION(satellite_exception_id); -extern PHP_FUNCTION(satellite_exception_value); +PHP_FUNCTION(satellite_caught_exception); +PHP_FUNCTION(satellite_exception_id); +PHP_FUNCTION(satellite_exception_value); #endif /* _PHP_ORBIT_H */ Index: php4/ext/shmop/shmop.c diff -u php4/ext/shmop/shmop.c:1.13 php4/ext/shmop/shmop.c:1.14 --- php4/ext/shmop/shmop.c:1.13 Wed Jun 6 09:05:50 2001 +++ php4/ext/shmop/shmop.c Sun Jul 29 21:56:36 2001 @@ -16,7 +16,7 @@ | Ilia Alshanetsky (iliaa@home.com) | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.13 2001/06/06 13:05:50 rasmus Exp $ */ +/* $Id: shmop.c,v 1.14 2001/07/30 01:56:36 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -76,6 +76,7 @@ static void rsclean(zend_rsrc_list_entry *rsrc) { struct php_shmop *shmop = (struct php_shmop *)rsrc->ptr; + shmdt(shmop->addr); efree(shmop); } Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.37 php4/ext/standard/assert.c:1.38 --- php4/ext/standard/assert.c:1.37 Sat Jul 28 07:36:13 2001 +++ php4/ext/standard/assert.c Sun Jul 29 21:56:36 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.37 2001/07/28 11:36:13 zeev Exp $ */ +/* $Id: assert.c,v 1.38 2001/07/30 01:56:36 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -83,7 +83,6 @@ PHP_MINIT_FUNCTION(assert) { - #ifdef ZTS ts_allocate_id(&assert_globals_id, sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL); #else @@ -160,7 +159,7 @@ EG(error_reporting) = 0; } - compiled_string_description = zend_make_compiled_string_description("assert code"); + compiled_string_description = zend_make_compiled_string_description("assert code" TSRMLS_CC); if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { efree(compiled_string_description); zend_error(E_ERROR, "Failure evaluating code:\n%s\n", myeval); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.363 php4/ext/standard/basic_functions.c:1.364 --- php4/ext/standard/basic_functions.c:1.363 Sun Jul 29 04:20:30 2001 +++ php4/ext/standard/basic_functions.c Sun Jul 29 21:56:37 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.363 2001/07/29 08:20:30 andi Exp $ */ +/* $Id: basic_functions.c,v 1.364 2001/07/30 01:56:37 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -1879,7 +1879,7 @@ TSRMLS_FETCH(); if (BG(user_shutdown_function_names)) zend_try { - zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t)user_shutdown_function_call); + zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t) user_shutdown_function_call); memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf)); zend_hash_destroy(BG(user_shutdown_function_names)); efree(BG(user_shutdown_function_names)); @@ -1965,7 +1965,7 @@ php_get_highlight_struct(&syntax_highlighter_ini); - hicompiled_string_description = zend_make_compiled_string_description("highlighted code"); + hicompiled_string_description = zend_make_compiled_string_description("highlighted code" TSRMLS_CC); if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description)==FAILURE) { efree(hicompiled_string_description); @@ -2086,16 +2086,17 @@ } -void test_class_startup() +void test_class_startup(void) { zend_class_entry test_class_entry; + TSRMLS_FETCH(); INIT_OVERLOADED_CLASS_ENTRY(test_class_entry, "OverloadedTestClass", NULL, test_class_call_function, test_class_get_property, test_class_set_property); - zend_register_internal_class(&test_class_entry); + zend_register_internal_class(&test_class_entry TSRMLS_CC); } /* {{{ proto string ini_get(string varname) Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.73 php4/ext/standard/dir.c:1.74 --- php4/ext/standard/dir.c:1.73 Sun Jul 29 04:14:00 2001 +++ php4/ext/standard/dir.c Sun Jul 29 21:56:37 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.73 2001/07/29 08:14:00 andi Exp $ */ +/* $Id: dir.c,v 1.74 2001/07/30 01:56:37 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -122,7 +122,7 @@ le_dirp = zend_register_list_destructors_ex(_dir_dtor, NULL, "dir", module_number); INIT_CLASS_ENTRY(dir_class_entry, "Directory", php_dir_class_functions); - dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry); + dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry TSRMLS_CC); #ifdef ZTS ts_allocate_id(&dir_globals_id, sizeof(php_dir_globals), NULL, NULL); Index: php4/ext/standard/incomplete_class.c diff -u php4/ext/standard/incomplete_class.c:1.9 php4/ext/standard/incomplete_class.c:1.10 --- php4/ext/standard/incomplete_class.c:1.9 Sat Jul 28 14:40:18 2001 +++ php4/ext/standard/incomplete_class.c Sun Jul 29 21:56:37 2001 @@ -17,7 +17,7 @@ */ -/* $Id: incomplete_class.c,v 1.9 2001/07/28 18:40:18 andi Exp $ */ +/* $Id: incomplete_class.c,v 1.10 2001/07/30 01:56:37 zeev Exp $ */ #include "php.h" #include "basic_functions.h" @@ -97,7 +97,7 @@ incomplete_class_get_property, incomplete_class_set_property); - BG(incomplete_class) = zend_register_internal_class(&incomplete_class); + BG(incomplete_class) = zend_register_internal_class(&incomplete_class TSRMLS_CC); return (BG(incomplete_class)); } Index: php4/ext/standard/pack.h diff -u php4/ext/standard/pack.h:1.9 php4/ext/standard/pack.h:1.10 --- php4/ext/standard/pack.h:1.9 Mon Feb 26 01:07:23 2001 +++ php4/ext/standard/pack.h Sun Jul 29 21:56:37 2001 @@ -16,12 +16,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: pack.h,v 1.9 2001/02/26 06:07:23 andi Exp $ */ +/* $Id: pack.h,v 1.10 2001/07/30 01:56:37 zeev Exp $ */ #ifndef PACK_H #define PACK_H -extern PHP_MINIT_FUNCTION(pack); +PHP_MINIT_FUNCTION(pack); PHP_FUNCTION(pack); PHP_FUNCTION(unpack); Index: php4/ext/standard/php_browscap.h diff -u php4/ext/standard/php_browscap.h:1.6 php4/ext/standard/php_browscap.h:1.7 --- php4/ext/standard/php_browscap.h:1.6 Mon Feb 26 01:07:23 2001 +++ php4/ext/standard/php_browscap.h Sun Jul 29 21:56:37 2001 @@ -16,13 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_browscap.h,v 1.6 2001/02/26 06:07:23 andi Exp $ */ +/* $Id: php_browscap.h,v 1.7 2001/07/30 01:56:37 zeev Exp $ */ #ifndef PHP_BROWSCAP_H #define PHP_BROWSCAP_H -extern PHP_MINIT_FUNCTION(browscap); -extern PHP_MSHUTDOWN_FUNCTION(browscap); +PHP_MINIT_FUNCTION(browscap); +PHP_MSHUTDOWN_FUNCTION(browscap); PHP_FUNCTION(get_browser); Index: php4/ext/standard/php_crypt.h diff -u php4/ext/standard/php_crypt.h:1.8 php4/ext/standard/php_crypt.h:1.9 --- php4/ext/standard/php_crypt.h:1.8 Sun May 6 12:54:27 2001 +++ php4/ext/standard/php_crypt.h Sun Jul 29 21:56:37 2001 @@ -18,15 +18,15 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_crypt.h,v 1.8 2001/05/06 16:54:27 sniper Exp $ */ +/* $Id: php_crypt.h,v 1.9 2001/07/30 01:56:37 zeev Exp $ */ #ifndef PHP_CRYPT_H #define PHP_CRYPT_H PHP_FUNCTION(crypt); #if HAVE_CRYPT -extern PHP_MINIT_FUNCTION(crypt); -extern PHP_RINIT_FUNCTION(crypt); +PHP_MINIT_FUNCTION(crypt); +PHP_RINIT_FUNCTION(crypt); #endif #endif Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.208 php4/ext/standard/string.c:1.209 --- php4/ext/standard/string.c:1.208 Sat Jul 28 07:36:18 2001 +++ php4/ext/standard/string.c Sun Jul 29 21:56:37 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.208 2001/07/28 11:36:18 zeev Exp $ */ +/* $Id: string.c,v 1.209 2001/07/30 01:56:37 zeev Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -151,7 +151,6 @@ PHP_MINIT_FUNCTION(localeconv) { locale_mutex = tsrm_mutex_alloc(); - return SUCCESS; } /* }}} */ Index: php4/ext/swf/php_swf.h diff -u php4/ext/swf/php_swf.h:1.14 php4/ext/swf/php_swf.h:1.15 --- php4/ext/swf/php_swf.h:1.14 Sat Jul 28 07:36:19 2001 +++ php4/ext/swf/php_swf.h Sun Jul 29 21:56:38 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_swf.h,v 1.14 2001/07/28 11:36:19 zeev Exp $ */ +/* $Id: php_swf.h,v 1.15 2001/07/30 01:56:38 zeev Exp $ */ #ifndef PHP_SWF_H #define PHP_SWF_H @@ -29,9 +29,9 @@ PHP_MINIT_FUNCTION(swf); PHP_MINFO_FUNCTION(swf); PHP_RINIT_FUNCTION(swf); -extern void php_swf_define(INTERNAL_FUNCTION_PARAMETERS, int opt); -extern void php_swf_fill_bitmap(INTERNAL_FUNCTION_PARAMETERS, int opt); -extern void php_swf_geo_same(INTERNAL_FUNCTION_PARAMETERS, int opt); +void php_swf_define(INTERNAL_FUNCTION_PARAMETERS, int opt); +void php_swf_fill_bitmap(INTERNAL_FUNCTION_PARAMETERS, int opt); +void php_swf_geo_same(INTERNAL_FUNCTION_PARAMETERS, int opt); PHP_FUNCTION(swf_openfile); PHP_FUNCTION(swf_closefile); PHP_FUNCTION(swf_labelframe); Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.22 php4/ext/sybase/php_sybase_db.c:1.23 --- php4/ext/sybase/php_sybase_db.c:1.22 Sat Jul 28 07:36:20 2001 +++ php4/ext/sybase/php_sybase_db.c Sun Jul 29 21:56:38 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.22 2001/07/28 11:36:20 zeev Exp $ */ +/* $Id: php_sybase_db.c,v 1.23 2001/07/30 01:56:38 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -177,7 +177,7 @@ will *not* be in a consistent state. thies@thieso.net */ - zend_hash_apply(&EG(regular_list),(int (*)(void *))_clean_invalid_results); + zend_hash_apply(&EG(regular_list), (apply_func_t) _clean_invalid_results); dbclose(sybase_ptr->link); dbloginfree(sybase_ptr->login); efree(sybase_ptr); Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.54 php4/ext/sybase_ct/php_sybase_ct.c:1.55 --- php4/ext/sybase_ct/php_sybase_ct.c:1.54 Sat Jul 28 07:36:21 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Sun Jul 29 21:56:39 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.54 2001/07/28 11:36:21 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.55 2001/07/30 01:56:39 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -149,7 +149,7 @@ sybase_ptr->valid = 0; - zend_hash_apply(&EG(regular_list),(int (*)(void *))_clean_invalid_results); + zend_hash_apply(&EG(regular_list), (apply_func_t) _clean_invalid_results); /* Non-persistent connections will always be connected or we wouldn't * get here, but since we want to check the death status anyway Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.31 php4/ext/sysvsem/sysvsem.c:1.32 --- php4/ext/sysvsem/sysvsem.c:1.31 Wed Jun 6 09:05:52 2001 +++ php4/ext/sysvsem/sysvsem.c Sun Jul 29 21:56:39 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.31 2001/06/06 13:05:52 rasmus Exp $ */ +/* $Id: sysvsem.c,v 1.32 2001/07/30 01:56:39 zeev Exp $ */ /* Latest update build anc tested on Linux 2.2.14 * @@ -143,7 +143,6 @@ PHP_MINIT_FUNCTION(sysvsem) { php_sysvsem_module.le_sem = zend_register_list_destructors_ex(release_sysvsem_sem, NULL, "sysvsem", module_number); - return SUCCESS; } /* }}} */ Index: php4/ext/sysvshm/php_sysvshm.h diff -u php4/ext/sysvshm/php_sysvshm.h:1.8 php4/ext/sysvshm/php_sysvshm.h:1.9 --- php4/ext/sysvshm/php_sysvshm.h:1.8 Mon Feb 26 01:07:25 2001 +++ php4/ext/sysvshm/php_sysvshm.h Sun Jul 29 21:56:40 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sysvshm.h,v 1.8 2001/02/26 06:07:25 andi Exp $ */ +/* $Id: php_sysvshm.h,v 1.9 2001/07/30 01:56:40 zeev Exp $ */ #ifndef PHP_SYSVSHM_H #define PHP_SYSVSHM_H @@ -68,9 +68,9 @@ PHP_FUNCTION(shm_put_var); PHP_FUNCTION(shm_get_var); PHP_FUNCTION(shm_remove_var); -extern int php_put_shm_data(sysvshm_chunk_head *ptr,long key,char *data, long len); -extern long php_check_shm_data(sysvshm_chunk_head *ptr, long key); -extern int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos); +int php_put_shm_data(sysvshm_chunk_head *ptr,long key,char *data, long len); +long php_check_shm_data(sysvshm_chunk_head *ptr, long key); +int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos); extern sysvshm_module php_sysvshm; Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.14 php4/ext/xslt/sablot.c:1.15 --- php4/ext/xslt/sablot.c:1.14 Tue Jul 3 08:16:02 2001 +++ php4/ext/xslt/sablot.c Sun Jul 29 21:56:40 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.14 2001/07/03 12:16:02 sterling Exp $ */ +/* $Id: sablot.c,v 1.15 2001/07/30 01:56:40 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -149,7 +149,6 @@ PHP_MINIT_FUNCTION(xslt) { le_xslt = zend_register_list_destructors_ex(free_processor, NULL, le_xslt_name, module_number); - return SUCCESS; } /* }}} */ Index: php4/ext/zip/zip.c diff -u php4/ext/zip/zip.c:1.8 php4/ext/zip/zip.c:1.9 --- php4/ext/zip/zip.c:1.8 Wed Jun 6 16:30:58 2001 +++ php4/ext/zip/zip.c Sun Jul 29 21:56:41 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zip.c,v 1.8 2001/06/06 20:30:58 sterling Exp $ */ +/* $Id: zip.c,v 1.9 2001/07/30 01:56:41 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -100,7 +100,6 @@ { le_zip_dir = zend_register_list_destructors_ex(php_zip_free_dir, NULL, le_zip_dir_name, module_number); le_zip_entry = zend_register_list_destructors_ex(php_zip_free_entry, NULL, le_zip_entry_name, module_number); - return(SUCCESS); } /* }}} */ Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.85 php4/ext/zlib/zlib.c:1.86 --- php4/ext/zlib/zlib.c:1.85 Sat Jul 28 07:36:26 2001 +++ php4/ext/zlib/zlib.c Sun Jul 29 21:56:41 2001 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.85 2001/07/28 11:36:26 zeev Exp $ */ +/* $Id: zlib.c,v 1.86 2001/07/30 01:56:41 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -158,8 +158,6 @@ */ PHP_MINIT_FUNCTION(zlib) { - TSRMLS_FETCH(); - #ifdef ZTS ts_allocate_id(&zlib_globals_id, sizeof(php_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL); #else Index: php4/main/internal_functions_win32.c diff -u php4/main/internal_functions_win32.c:1.44 php4/main/internal_functions_win32.c:1.45 --- php4/main/internal_functions_win32.c:1.44 Sun Jul 29 18:15:41 2001 +++ php4/main/internal_functions_win32.c Sun Jul 29 21:56:42 2001 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions_win32.c,v 1.44 2001/07/29 22:15:41 hirokawa Exp $ */ +/* $Id: internal_functions_win32.c,v 1.45 2001/07/30 01:56:42 zeev Exp $ */ /* {{{ includes */ @@ -60,7 +60,7 @@ #include "ext/xml/php_xml.h" #include "ext/wddx/php_wddx.h" #include "ext/mysql/php_mysql.h" -#include "ext/mysql/mbstring.h" +#include "ext/mbstring/mbstring.h" /* }}} */ /* {{{ php_builtin_extensions[] Index: php4/main/main.c diff -u php4/main/main.c:1.387 php4/main/main.c:1.388 --- php4/main/main.c:1.387 Sat Jul 28 07:36:27 2001 +++ php4/main/main.c Sun Jul 29 21:56:42 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.387 2001/07/28 11:36:27 zeev Exp $ */ +/* $Id: main.c,v 1.388 2001/07/30 01:56:42 zeev Exp $ */ /* {{{ includes */ @@ -700,7 +700,7 @@ } zend_end_try(); if (PG(modules_activated)) { - zend_deactivate_modules(); + zend_deactivate_modules(TSRMLS_C); } zend_deactivate(TSRMLS_C); Index: php4/main/php.h diff -u php4/main/php.h:1.144 php4/main/php.h:1.145 --- php4/main/php.h:1.144 Tue Jul 24 16:30:34 2001 +++ php4/main/php.h Sun Jul 29 21:56:42 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.144 2001/07/24 20:30:34 zeev Exp $ */ +/* $Id: php.h,v 1.145 2001/07/30 01:56:42 zeev Exp $ */ #ifndef PHP_H #define PHP_H @@ -221,16 +221,12 @@ #define PHP_RINIT(module) php_rinit_##module #define PHP_RSHUTDOWN(module) php_rshutdown_##module #define PHP_MINFO(module) php_info_##module -#define PHP_GINIT(module) php_ginit_##module -#define PHP_GSHUTDOWN(module) php_gshutdown_##module #define PHP_MINIT_FUNCTION(module) int PHP_MINIT(module)(INIT_FUNC_ARGS) #define PHP_MSHUTDOWN_FUNCTION(module) int PHP_MSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS) #define PHP_RINIT_FUNCTION(module) int PHP_RINIT(module)(INIT_FUNC_ARGS) #define PHP_RSHUTDOWN_FUNCTION(module) int PHP_RSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS) #define PHP_MINFO_FUNCTION(module) void PHP_MINFO(module)(ZEND_MODULE_INFO_FUNC_ARGS) -#define PHP_GINIT_FUNCTION(module) int PHP_GINIT(module)(GINIT_FUNC_ARGS) -#define PHP_GSHUTDOWN_FUNCTION(module) int PHP_GSHUTDOWN(module)(void) /* global variables */ Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.110 php4/sapi/apache/mod_php4.c:1.111 --- php4/sapi/apache/mod_php4.c:1.110 Sat Jul 28 07:36:30 2001 +++ php4/sapi/apache/mod_php4.c Sun Jul 29 21:56:43 2001 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.110 2001/07/28 11:36:30 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.111 2001/07/30 01:56:43 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -521,7 +521,7 @@ per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module); if (per_dir_conf) { - zend_hash_apply((HashTable *) per_dir_conf, (int (*)(void *)) php_apache_alter_ini_entries); + zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries); } /* If PHP parser engine has been turned off with an "engine off"