diff options
| -rw-r--r-- | ext/fdf/fdf.c | 35 | ||||
| -rw-r--r-- | ext/fdf/php3_fdf.h | 7 | ||||
| -rw-r--r-- | ext/filepro/filepro.c | 21 | ||||
| -rw-r--r-- | ext/filepro/php_filepro.h | 5 | ||||
| -rw-r--r-- | ext/gd/gd.c | 88 | ||||
| -rw-r--r-- | ext/gd/php3_gd.h | 11 | ||||
| -rw-r--r-- | ext/gettext/gettext.c | 16 | ||||
| -rw-r--r-- | ext/gettext/php3_gettext.h | 3 | ||||
| -rw-r--r-- | ext/hyperwave/hw.c | 135 | ||||
| -rw-r--r-- | ext/hyperwave/hw.h | 5 |
10 files changed, 168 insertions, 158 deletions
diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c index bc7568ebb9..b3d4b05114 100644 --- a/ext/fdf/fdf.c +++ b/ext/fdf/fdf.c @@ -64,23 +64,24 @@ int le_fdf; #endif function_entry fdf_functions[] = { - {"fdf_open", php3_fdf_open, NULL}, - {"fdf_create", php3_fdf_create, NULL}, - {"fdf_close", php3_fdf_close, NULL}, - {"fdf_save", php3_fdf_save, NULL}, - {"fdf_get_value", php3_fdf_get_value, NULL}, - {"fdf_set_value", php3_fdf_set_value, NULL}, - {"fdf_next_field_name", php3_fdf_next_field_name, NULL}, - {"fdf_set_ap", php3_fdf_set_ap, NULL}, - {"fdf_set_status", php3_fdf_set_status, NULL}, - {"fdf_get_status", php3_fdf_get_status, NULL}, - {"fdf_set_file", php3_fdf_set_file, NULL}, - {"fdf_get_file", php3_fdf_get_file, NULL}, + PHP_FE(fdf_open, NULL) + PHP_FE(fdf_create, NULL) + PHP_FE(fdf_close, NULL) + PHP_FE(fdf_save, NULL) + PHP_FE(fdf_get_value, NULL) + PHP_FE(fdf_set_value, NULL) + PHP_FE(fdf_next_field_name, NULL) + PHP_FE(fdf_set_ap, NULL) + PHP_FE(fdf_set_status, NULL) + PHP_FE(fdf_get_status, NULL) + PHP_FE(fdf_set_file, NULL) + PHP_FE(fdf_get_file, NULL) {NULL, NULL, NULL} }; php3_module_entry fdf_module_entry = { - "fdf", fdf_functions, php3_minit_fdf, php3_mend_fdf, NULL, NULL, php3_info_fdf, STANDARD_MODULE_PROPERTIES + "fdf", fdf_functions, PHP_MINIT(fdf), PHP_MSHUTDOWN(fdf), NULL, NULL, + PHP_MINFO(fdf), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL @@ -88,7 +89,7 @@ php3_module_entry fdf_module_entry = { DLEXPORT php3_module_entry *get_module(void) { return &fdf_module_entry; } #endif -int php3_minit_fdf(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(fdf) { FDFErc err; FDF_GLOBAL(le_fdf) = register_list_destructors(FDFClose, NULL); @@ -98,12 +99,14 @@ int php3_minit_fdf(INIT_FUNC_ARGS) return SUCCESS; } -void php3_info_fdf(ZEND_MODULE_INFO_FUNC_ARGS) { +PHP_MINFO_FUNCTION(fdf) +{ /* need to use a PHPAPI function here because it is external module in windows */ php3_printf("FdfTk Version %s", FDFGetVersion()); } -int php3_mend_fdf(void){ +PHP_MSHUTDOWN_FUNCTION(fdf) +{ FDFErc err; err = FDFFinalize(); if(err == FDFErcOK) diff --git a/ext/fdf/php3_fdf.h b/ext/fdf/php3_fdf.h index 9b60791641..553982295a 100644 --- a/ext/fdf/php3_fdf.h +++ b/ext/fdf/php3_fdf.h @@ -42,9 +42,10 @@ extern php3_module_entry fdf_module_entry; #define phpext_fdf_ptr &fdf_module_entry -extern int php3_minit_fdf(INIT_FUNC_ARGS); -extern int php3_mend_fdf(void); -void php3_info_fdf(ZEND_MODULE_INFO_FUNC_ARGS); +extern PHP_MINIT_FUNCTION(fdf); +extern PHP_MSHUTDOWN_FUNCTION(fdf); +PHP_MINFO_FUNCTION(fdf); + PHP_FUNCTION(fdf_open); PHP_FUNCTION(fdf_close); PHP_FUNCTION(fdf_create); diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c index 2f12bcde5c..2ce67be16b 100644 --- a/ext/filepro/filepro.c +++ b/ext/filepro/filepro.c @@ -72,7 +72,7 @@ static FP_FIELD *fp_fieldlist = NULL; /* List of fields */ #endif -int php3_minit_filepro(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(filepro) { #ifdef THREAD_SAFE fp_global_struct *fp_globals; @@ -98,7 +98,8 @@ int php3_minit_filepro(INIT_FUNC_ARGS) return SUCCESS; } -int php3_mend_filepro(void){ +PHP_MSHUTDOWN_FUNCTION(filepro) +{ #ifdef THREAD_SAFE fp_global_struct *fp_globals; fp_globals = TlsGetValue(FPTls); @@ -120,18 +121,18 @@ int php3_mend_filepro(void){ function_entry filepro_functions[] = { - {"filepro", php3_filepro, NULL}, - {"filepro_rowcount", php3_filepro_rowcount, NULL}, - {"filepro_fieldname", php3_filepro_fieldname, NULL}, - {"filepro_fieldtype", php3_filepro_fieldtype, NULL}, - {"filepro_fieldwidth", php3_filepro_fieldwidth, NULL}, - {"filepro_fieldcount", php3_filepro_fieldcount, NULL}, - {"filepro_retrieve", php3_filepro_retrieve, NULL}, + PHP_FE(filepro, NULL) + PHP_FE(filepro_rowcount, NULL) + PHP_FE(filepro_fieldname, NULL) + PHP_FE(filepro_fieldtype, NULL) + PHP_FE(filepro_fieldwidth, NULL) + PHP_FE(filepro_fieldcount, NULL) + PHP_FE(filepro_retrieve, NULL) {NULL, NULL, NULL} }; php3_module_entry filepro_module_entry = { - "FilePro", filepro_functions, php3_minit_filepro, php3_mend_filepro, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES + "FilePro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/filepro/php_filepro.h b/ext/filepro/php_filepro.h index 21a9fbe1f1..850eeb8dcd 100644 --- a/ext/filepro/php_filepro.h +++ b/ext/filepro/php_filepro.h @@ -49,8 +49,9 @@ PHP_FUNCTION(filepro_fieldtype); PHP_FUNCTION(filepro_fieldwidth); PHP_FUNCTION(filepro_fieldcount); PHP_FUNCTION(filepro_retrieve); -extern int php3_minit_filepro(INIT_FUNC_ARGS); -extern int php3_mend_filepro(void); + +extern PHP_MINIT_FUNCTION(filepro); +extern PHP_MSHUTDOWN_FUNCTION(filepro); #else #define phpext_filepro_ptr NULL #endif diff --git a/ext/gd/gd.c b/ext/gd/gd.c index bd82f1ce70..6e549e9026 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -82,51 +82,51 @@ int le_gd_font; #endif function_entry gd_functions[] = { - {"imagearc", php3_imagearc, NULL}, - {"imagechar", php3_imagechar, NULL}, - {"imagecharup", php3_imagecharup, NULL}, - {"imagecolorallocate", php3_imagecolorallocate, NULL}, - {"imagecolorat", php3_imagecolorat, NULL}, - {"imagecolorclosest", php3_imagecolorclosest, NULL}, - {"imagecolordeallocate", php3_imagecolordeallocate, NULL}, - {"imagecolorresolve", php3_imagecolorresolve, NULL}, - {"imagecolorexact", php3_imagecolorexact, NULL}, - {"imagecolorset", php3_imagecolorset, NULL}, - {"imagecolortransparent", php3_imagecolortransparent, NULL}, - {"imagecolorstotal", php3_imagecolorstotal, NULL}, - {"imagecolorsforindex", php3_imagecolorsforindex, NULL}, - {"imagecopy", php3_imagecopy, NULL}, - {"imagecopyresized", php3_imagecopyresized, NULL}, - {"imagecreate", php3_imagecreate, NULL}, - {"imagecreatefromgif", php3_imagecreatefromgif, NULL}, - {"imagedestroy", php3_imagedestroy, NULL}, - {"imagefill", php3_imagefill, NULL}, - {"imagefilledpolygon", php3_imagefilledpolygon, NULL}, - {"imagefilledrectangle", php3_imagefilledrectangle, NULL}, - {"imagefilltoborder", php3_imagefilltoborder, NULL}, - {"imagefontwidth", php3_imagefontwidth, NULL}, - {"imagefontheight", php3_imagefontheight, NULL}, - {"imagegif", php3_imagegif, NULL}, - {"imageinterlace", php3_imageinterlace, NULL}, - {"imageline", php3_imageline, NULL}, - {"imageloadfont", php3_imageloadfont, NULL}, - {"imagepolygon", php3_imagepolygon, NULL}, - {"imagerectangle", php3_imagerectangle, NULL}, - {"imagesetpixel", php3_imagesetpixel, NULL}, - {"imagestring", php3_imagestring, NULL}, - {"imagestringup", php3_imagestringup, NULL}, - {"imagesx", php3_imagesxfn, NULL}, - {"imagesy", php3_imagesyfn, NULL}, - {"imagedashedline", php3_imagedashedline, NULL}, + PHP_FE(imagearc, NULL) + PHP_FE(imagechar, NULL) + PHP_FE(imagecharup, NULL) + PHP_FE(imagecolorallocate, NULL) + PHP_FE(imagecolorat, NULL) + PHP_FE(imagecolorclosest, NULL) + PHP_FE(imagecolordeallocate, NULL) + PHP_FE(imagecolorresolve, NULL) + PHP_FE(imagecolorexact, NULL) + PHP_FE(imagecolorset, NULL) + PHP_FE(imagecolortransparent, NULL) + PHP_FE(imagecolorstotal, NULL) + PHP_FE(imagecolorsforindex, NULL) + PHP_FE(imagecopy, NULL) + PHP_FE(imagecopyresized, NULL) + PHP_FE(imagecreate, NULL) + PHP_FE(imagecreatefromgif, NULL) + PHP_FE(imagedestroy, NULL) + PHP_FE(imagefill, NULL) + PHP_FE(imagefilledpolygon, NULL) + PHP_FE(imagefilledrectangle, NULL) + PHP_FE(imagefilltoborder, NULL) + PHP_FE(imagefontwidth, NULL) + PHP_FE(imagefontheight, NULL) + PHP_FE(imagegif, NULL) + PHP_FE(imageinterlace, NULL) + PHP_FE(imageline, NULL) + PHP_FE(imageloadfont, NULL) + PHP_FE(imagepolygon, NULL) + PHP_FE(imagerectangle, NULL) + PHP_FE(imagesetpixel, NULL) + PHP_FE(imagestring, NULL) + PHP_FE(imagestringup, NULL) + PHP_FE(imagesx, NULL) + PHP_FE(imagesy, NULL) + PHP_FE(imagedashedline, NULL) #ifdef ENABLE_GD_TTF - {"imagettfbbox", php3_imagettfbbox, NULL}, - {"imagettftext", php3_imagettftext, NULL}, + PHP_FE(imagettfbbox, NULL) + PHP_FE(imagettftext, NULL) #endif {NULL, NULL, NULL} }; php3_module_entry gd_module_entry = { - "gd", gd_functions, php3_minit_gd, php3_mend_gd, NULL, NULL, php3_info_gd, STANDARD_MODULE_PROPERTIES + "gd", gd_functions, PHP_MINIT(gd), PHP_MSHUTDOWN(gd), NULL, NULL, PHP_MINFO(gd), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL @@ -142,7 +142,7 @@ DLEXPORT php3_module_entry *get_module(void) { return &gd_module_entry; } #define PolyMaxPoints 256 -int php3_minit_gd(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(gd) { #if defined(THREAD_SAFE) gdlib_global_struct *gdlib_globals; @@ -167,7 +167,7 @@ int php3_minit_gd(INIT_FUNC_ARGS) return SUCCESS; } -void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS) +PHP_MINFO_FUNCTION(gd) { /* need to use a PHPAPI function here because it is external module in windows */ #if HAVE_LIBGD13 @@ -180,7 +180,7 @@ void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS) #endif } -int php3_mend_gd(SHUTDOWN_FUNC_ARGS) +PHP_MSHUTDOWN_FUNCTION(gd) { GD_TLS_VARS; #ifdef THREAD_SAFE @@ -1652,7 +1652,7 @@ PHP_FUNCTION(imagecopyresized) /* {{{ proto int imagesx(int im) Get image width */ -PHP_FUNCTION(imagesxfn) +PHP_FUNCTION(imagesx) { pval *IM; gdImagePtr im; @@ -1675,7 +1675,7 @@ PHP_FUNCTION(imagesxfn) /* {{{ proto int imagesy(int im) Get image height */ -PHP_FUNCTION(imagesyfn) +PHP_FUNCTION(imagesy) { pval *IM; gdImagePtr im; diff --git a/ext/gd/php3_gd.h b/ext/gd/php3_gd.h index d6ef1d53b1..1be536324d 100644 --- a/ext/gd/php3_gd.h +++ b/ext/gd/php3_gd.h @@ -52,9 +52,10 @@ extern php3_module_entry gd_module_entry; #define phpext_gd_ptr &gd_module_entry /* gd.c functions */ -void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS); -extern int php3_minit_gd(INIT_FUNC_ARGS); -extern int php3_mend_gd(SHUTDOWN_FUNC_ARGS); +PHP_MINFO_FUNCTION(gd); +extern PHP_MINIT_FUNCTION(gd); +extern PHP_MSHUTDOWN_FUNCTION(gd); + extern int gdImageColorResolve(gdImagePtr, int, int, int); PHP_FUNCTION(imagearc); PHP_FUNCTION(imagechar); @@ -89,8 +90,8 @@ PHP_FUNCTION(imagerectangle); PHP_FUNCTION(imagesetpixel); PHP_FUNCTION(imagestring); PHP_FUNCTION(imagestringup); -PHP_FUNCTION(imagesxfn); -PHP_FUNCTION(imagesyfn); +PHP_FUNCTION(imagesx); +PHP_FUNCTION(imagesy); void php3_free_gd_font(gdFontPtr); void _php3_gdimagecharup(gdImagePtr, gdFontPtr, int, int, int, int); PHP_FUNCTION(imagedashedline); diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index fd0b5f5e13..5aff1e32be 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -27,20 +27,20 @@ #include <libintl.h> function_entry php3_gettext_functions[] = { - {"textdomain", php3_textdomain, NULL}, - {"gettext", php3_gettext, NULL}, - {"_", php3_gettext, NULL}, - {"dgettext", php3_dgettext, NULL}, - {"dcgettext", php3_dcgettext, NULL}, - {"bindtextdomain", php3_bindtextdomain, NULL}, + PHP_FE(textdomain, NULL) + PHP_FE(gettext, NULL) + PHP_FALIAS(_, gettext, NULL) + PHP_FE(dgettext, NULL) + PHP_FE(dcgettext, NULL) + PHP_FE(bindtextdomain, NULL) {NULL, NULL, NULL} }; php3_module_entry php3_gettext_module_entry = { - "gettext", php3_gettext_functions, NULL, NULL, NULL, NULL, php3_info_gettext, STANDARD_MODULE_PROPERTIES + "gettext", php3_gettext_functions, NULL, NULL, NULL, NULL, PHP_MINFO(gettext), STANDARD_MODULE_PROPERTIES }; -void php3_info_gettext(ZEND_MODULE_INFO_FUNC_ARGS) +PHP_MINFO_FUNCTION(gettext) { php3_printf("GNU gettext support active."); } diff --git a/ext/gettext/php3_gettext.h b/ext/gettext/php3_gettext.h index dab9b85c3b..e01d041b94 100644 --- a/ext/gettext/php3_gettext.h +++ b/ext/gettext/php3_gettext.h @@ -40,7 +40,8 @@ extern php3_module_entry php3_gettext_module_entry; #define gettext_module_ptr &php3_gettext_module_entry -void php3_info_gettext(ZEND_MODULE_INFO_FUNC_ARGS); +PHP_MINFO_FUNCTION(gettext); + PHP_FUNCTION(textdomain); PHP_FUNCTION(gettext); PHP_FUNCTION(dgettext); diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index d3892b3f21..72f3e4c678 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -43,75 +43,75 @@ hw_module php3_hw_module; function_entry hw_functions[] = { - {"hw_connect", php3_hw_connect, NULL}, - {"hw_pconnect", php3_hw_pconnect, NULL}, - {"hw_close", php3_hw_close, NULL}, - {"hw_root", php3_hw_root, NULL}, - {"hw_info", php3_hw_info, NULL}, - {"hw_connection_info", php3_hw_connection_info, NULL}, - {"hw_error", php3_hw_error, NULL}, - {"hw_errormsg", php3_hw_errormsg, NULL}, - {"hw_getparentsobj", php3_hw_getparentsobj, NULL}, - {"hw_getparents", php3_hw_getparents, NULL}, - {"hw_children", php3_hw_children, NULL}, - {"hw_childrenobj", php3_hw_childrenobj, NULL}, - {"hw_getchildcoll", php3_hw_getchildcoll, NULL}, - {"hw_getchildcollobj", php3_hw_getchildcollobj, NULL}, - {"hw_getobject", php3_hw_getobject, NULL}, - {"hw_getandlock", php3_hw_getandlock, NULL}, - {"hw_unlock", php3_hw_unlock, NULL}, - {"hw_gettext", php3_hw_gettext, NULL}, - {"hw_edittext", php3_hw_edittext, NULL}, - {"hw_getcgi", php3_hw_getcgi, NULL}, - {"hw_getremote", php3_hw_getremote, NULL}, - {"hw_getremotechildren", php3_hw_getremotechildren, NULL}, - {"hw_pipedocument", php3_hw_pipedocument, NULL}, - {"hw_pipecgi", php3_hw_pipecgi, NULL}, - {"hw_insertdocument", php3_hw_insertdocument, NULL}, - {"hw_mv", php3_hw_mv, NULL}, - {"hw_cp", php3_hw_cp, NULL}, - {"hw_deleteobject", php3_hw_deleteobject, NULL}, - {"hw_changeobject", php3_hw_changeobject, NULL}, - {"hw_docbyanchor", php3_hw_docbyanchor, NULL}, - {"hw_docbyanchorobj", php3_hw_docbyanchorobj, NULL}, - {"hw_getobjectbyquery", php3_hw_getobjectbyquery, NULL}, - {"hw_getobjectbyqueryobj", php3_hw_getobjectbyqueryobj, NULL}, - {"hw_getobjectbyquerycoll", php3_hw_getobjectbyquerycoll, NULL}, - {"hw_getobjectbyquerycollobj", php3_hw_getobjectbyquerycollobj,NULL}, - {"hw_getchilddoccoll", php3_hw_getchilddoccoll, NULL}, - {"hw_getchilddoccollobj", php3_hw_getchilddoccollobj, NULL}, - {"hw_getanchors", php3_hw_getanchors, NULL}, - {"hw_getanchorsobj", php3_hw_getanchorsobj, NULL}, - {"hw_getusername", php3_hw_getusername, NULL}, - {"hw_setlinkroot", php3_hw_setlinkroot, NULL}, - {"hw_identify", php3_hw_identify, NULL}, - {"hw_free_document", php3_hw_free_document, NULL}, - {"hw_new_document", php3_hw_new_document, NULL}, - {"hw_output_document", php3_hw_output_document, NULL}, - {"hw_outputdocument", php3_hw_output_document, NULL}, - {"hw_document_size", php3_hw_document_size, NULL}, - {"hw_documentsize", php3_hw_document_size, NULL}, - {"hw_document_attributes", php3_hw_document_attributes, NULL}, - {"hw_documentattributes", php3_hw_document_attributes, NULL}, - {"hw_document_bodytag", php3_hw_document_bodytag, NULL}, - {"hw_documentbodytag", php3_hw_document_bodytag, NULL}, - {"hw_document_content", php3_hw_document_content, NULL}, - {"hw_objrec2array", php3_hw_objrec2array, NULL}, - {"hw_array2objrec", php3_hw_array2objrec, NULL}, - {"hw_incollections", php3_hw_incollections, NULL}, - {"hw_inscoll", php3_hw_inscoll, NULL}, - {"hw_insertobject", php3_hw_insertobject, NULL}, - {"hw_insdoc", php3_hw_insdoc, NULL}, - {"hw_getsrcbydestobj", php3_hw_getsrcbydestobj, NULL}, - {"hw_getrellink", php3_hw_getrellink, NULL}, - {"hw_who", php3_hw_who, NULL}, - {"hw_stat", php3_hw_stat, NULL}, - {"hw_dummy", php3_hw_dummy, NULL}, + PHP_FE(hw_connect, NULL) + PHP_FE(hw_pconnect, NULL) + PHP_FE(hw_close, NULL) + PHP_FE(hw_root, NULL) + PHP_FE(hw_info, NULL) + PHP_FE(hw_connection_info, NULL) + PHP_FE(hw_error, NULL) + PHP_FE(hw_errormsg, NULL) + PHP_FE(hw_getparentsobj, NULL) + PHP_FE(hw_getparents, NULL) + PHP_FE(hw_children, NULL) + PHP_FE(hw_childrenobj, NULL) + PHP_FE(hw_getchildcoll, NULL) + PHP_FE(hw_getchildcollobj, NULL) + PHP_FE(hw_getobject, NULL) + PHP_FE(hw_getandlock, NULL) + PHP_FE(hw_unlock, NULL) + PHP_FE(hw_gettext, NULL) + PHP_FE(hw_edittext, NULL) + PHP_FE(hw_getcgi, NULL) + PHP_FE(hw_getremote, NULL) + PHP_FE(hw_getremotechildren, NULL) + PHP_FE(hw_pipedocument, NULL) + PHP_FE(hw_pipecgi, NULL) + PHP_FE(hw_insertdocument, NULL) + PHP_FE(hw_mv, NULL) + PHP_FE(hw_cp, NULL) + PHP_FE(hw_deleteobject, NULL) + PHP_FE(hw_changeobject, NULL) + PHP_FE(hw_docbyanchor, NULL) + PHP_FE(hw_docbyanchorobj, NULL) + PHP_FE(hw_getobjectbyquery, NULL) + PHP_FE(hw_getobjectbyqueryobj, NULL) + PHP_FE(hw_getobjectbyquerycoll, NULL) + PHP_FE(hw_getobjectbyquerycollobj, NULL) + PHP_FE(hw_getchilddoccoll, NULL) + PHP_FE(hw_getchilddoccollobj, NULL) + PHP_FE(hw_getanchors, NULL) + PHP_FE(hw_getanchorsobj, NULL) + PHP_FE(hw_getusername, NULL) + PHP_FE(hw_setlinkroot, NULL) + PHP_FE(hw_identify, NULL) + PHP_FE(hw_free_document, NULL) + PHP_FE(hw_new_document, NULL) + PHP_FE(hw_output_document, NULL) + PHP_FE(hw_outputdocument, NULL) + PHP_FE(hw_document_size, NULL) + PHP_FE(hw_documentsize, NULL) + PHP_FE(hw_document_attributes, NULL) + PHP_FE(hw_documentattributes, NULL) + PHP_FE(hw_document_bodytag, NULL) + PHP_FE(hw_documentbodytag, NULL) + PHP_FE(hw_document_content, NULL) + PHP_FE(hw_objrec2array, NULL) + PHP_FE(hw_array2objrec, NULL) + PHP_FE(hw_incollections, NULL) + PHP_FE(hw_inscoll, NULL) + PHP_FE(hw_insertobject, NULL) + PHP_FE(hw_insdoc, NULL) + PHP_FE(hw_getsrcbydestobj, NULL) + PHP_FE(hw_getrellink, NULL) + PHP_FE(hw_who, NULL) + PHP_FE(hw_stat, NULL) + PHP_FE(hw_dummy, NULL) {NULL, NULL, NULL} }; php3_module_entry hw_module_entry = { - "HyperWave", hw_functions, php3_minit_hw, NULL, NULL, NULL, php3_info_hw, 0, 0, 0, NULL + "HyperWave", hw_functions, PHP_MINIT(hw), NULL, NULL, NULL, PHP_MINFO(hw), 0, 0, 0, NULL }; void print_msg(hg_msg *msg, char *str, int txt); @@ -382,7 +382,8 @@ static int * make_ints_from_array(HashTable *lht) { return objrec; } -int php3_minit_hw(INIT_FUNC_ARGS) { +PHP_MINIT_FUNCTION(hw) +{ if (cfg_get_long("hw.allow_persistent",&php3_hw_module.allow_persistent)==FAILURE) { php3_hw_module.allow_persistent=1; @@ -2952,7 +2953,7 @@ PHP_FUNCTION(hw_getrellink) { /* }}} */ -void php3_info_hw(ZEND_MODULE_INFO_FUNC_ARGS) +PHP_MINFO_FUNCTION(hw) { php3_printf("HG-CSP Version: 7.17"); } diff --git a/ext/hyperwave/hw.h b/ext/hyperwave/hw.h index fc3e6d1023..332620d8c0 100644 --- a/ext/hyperwave/hw.h +++ b/ext/hyperwave/hw.h @@ -53,7 +53,9 @@ typedef struct { extern hw_connection php3_hw_connection; -extern int php3_minit_hw(INIT_FUNC_ARGS); +extern PHP_MINIT_FUNCTION(hw); +PHP_MINFO_FUNCTION(hw); + PHP_FUNCTION(hw_connect); PHP_FUNCTION(hw_pconnect); PHP_FUNCTION(hw_close); @@ -109,7 +111,6 @@ PHP_FUNCTION(hw_document_content); PHP_FUNCTION(hw_objrec2array); PHP_FUNCTION(hw_array2objrec); PHP_FUNCTION(hw_connection_info); -void php3_info_hw(ZEND_MODULE_INFO_FUNC_ARGS); PHP_FUNCTION(hw_getsrcbydestobj); PHP_FUNCTION(hw_getrellink); PHP_FUNCTION(hw_dummy); |