diff options
Diffstat (limited to 'ext')
78 files changed, 110 insertions, 110 deletions
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index 26c9e42ae6..63aebc597d 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -33,7 +33,7 @@ ZEND_DECLARE_MODULE_GLOBALS(bcmath); -function_entry bcmath_functions[] = { +zend_function_entry bcmath_functions[] = { PHP_FE(bcadd, NULL) PHP_FE(bcsub, NULL) PHP_FE(bcmul, NULL) diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c index f3939c5ea3..8468a6a8f3 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -40,7 +40,7 @@ #define PHP_BZ_ERRSTR 1 #define PHP_BZ_ERRBOTH 2 -function_entry bz2_functions[] = { +zend_function_entry bz2_functions[] = { PHP_FE(bzopen, NULL) PHP_FE(bzread, NULL) PHP_FALIAS(bzwrite, fwrite, NULL) diff --git a/ext/calendar/cal_unix.c b/ext/calendar/cal_unix.c index a455eb09ae..3788aa4206 100644 --- a/ext/calendar/cal_unix.c +++ b/ext/calendar/cal_unix.c @@ -28,7 +28,7 @@ Convert UNIX timestamp to Julian Day */ PHP_FUNCTION(unixtojd) { - pval *timestamp; + zval *timestamp; long jdate; time_t t; struct tm *ta, tmbuf; @@ -60,7 +60,7 @@ PHP_FUNCTION(unixtojd) Convert Julian Day to UNIX timestamp */ PHP_FUNCTION(jdtounix) { - pval *jday; + zval *jday; long uday; if ((ZEND_NUM_ARGS()!= 1) || (zend_get_parameters(ht, 1, &jday) != SUCCESS)) { diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index 5ec4b3cd61..9e2f65176c 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -35,7 +35,7 @@ #include <stdio.h> -function_entry calendar_functions[] = { +zend_function_entry calendar_functions[] = { PHP_FE(jdtogregorian, NULL) PHP_FE(gregoriantojd, NULL) PHP_FE(jdtojulian, NULL) diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c index 54fa6cc9a6..4d4295a2e3 100644 --- a/ext/com_dotnet/com_extension.c +++ b/ext/com_dotnet/com_extension.c @@ -37,7 +37,7 @@ zend_class_entry *php_com_exception_class_entry, *php_com_saproxy_class_entry; -function_entry com_dotnet_functions[] = { +zend_function_entry com_dotnet_functions[] = { PHP_FE(variant_set, NULL) PHP_FE(variant_add, NULL) PHP_FE(variant_cat, NULL) diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c index 506abc561f..118f71cde4 100644 --- a/ext/ctype/ctype.c +++ b/ext/ctype/ctype.c @@ -43,7 +43,7 @@ ZEND_DECLARE_MODULE_GLOBALS(ctype) /* {{{ ctype_functions[] * Every user visible function must have an entry in ctype_functions[]. */ -function_entry ctype_functions[] = { +zend_function_entry ctype_functions[] = { PHP_FE(ctype_alnum, NULL) PHP_FE(ctype_alpha, NULL) PHP_FE(ctype_cntrl, NULL) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index f512fa591e..64a2e0d715 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -130,7 +130,7 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); /* {{{ curl_functions[] */ -function_entry curl_functions[] = { +zend_function_entry curl_functions[] = { PHP_FE(curl_init, NULL) PHP_FE(curl_copy_handle, NULL) PHP_FE(curl_version, NULL) diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 812dde2350..a7842922ad 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -53,7 +53,7 @@ /* {{{ dba_functions[] */ -function_entry dba_functions[] = { +zend_function_entry dba_functions[] = { PHP_FE(dba_open, NULL) PHP_FE(dba_popen, NULL) PHP_FE(dba_close, NULL) diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c index 764fc9fc05..82d26f7d4f 100644 --- a/ext/dbase/dbase.c +++ b/ext/dbase/dbase.c @@ -730,7 +730,7 @@ PHP_FUNCTION(dbase_create) /* {{{ dbase_functions[] */ -function_entry dbase_functions[] = { +zend_function_entry dbase_functions[] = { PHP_FE(dbase_open, NULL) PHP_FE(dbase_create, NULL) PHP_FE(dbase_close, NULL) diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index ded333bf36..33f7302d4a 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -189,7 +189,7 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) dom_nnodemap_object *objmap; int ret, previndex=1; HashTable *nodeht; - pval **entry; + zval **entry; php_dom_iterator *iterator = (php_dom_iterator *)iter; @@ -258,7 +258,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object TS zval *curattr = NULL; int ret, curindex = 0; HashTable *nodeht; - pval **entry; + zval **entry; php_dom_iterator *iterator = emalloc(sizeof(php_dom_iterator)); diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c index 52f6b0a44b..1c9851a8c7 100644 --- a/ext/dom/nodelist.c +++ b/ext/dom/nodelist.c @@ -109,7 +109,7 @@ PHP_FUNCTION(dom_nodelist_item) xmlNodePtr nodep, curnode; int count = 0; HashTable *nodeht; - pval **entry; + zval **entry; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_nodelist_class_entry, &index) == FAILURE) { return; diff --git a/ext/exif/exif.c b/ext/exif/exif.c index dca6d85201..f9ec894c41 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -105,7 +105,7 @@ ZEND_END_ARG_INFO(); /* {{{ exif_functions[] */ -function_entry exif_functions[] = { +zend_function_entry exif_functions[] = { PHP_FE(exif_read_data, NULL) PHP_FALIAS(read_exif_data, exif_read_data, NULL) PHP_FE(exif_tagname, NULL) @@ -1843,7 +1843,7 @@ static void exif_iif_free(image_info_type *image_info, int section_index) { /* {{{ add_assoc_image_info * Add image_info to associative array value. */ -static void add_assoc_image_info(pval *value, int sub_array, image_info_type *image_info, int section_index TSRMLS_DC) +static void add_assoc_image_info(zval *value, int sub_array, image_info_type *image_info, int section_index TSRMLS_DC) { char buffer[64], *val, *name, uname[64]; int i, ap, l, b, idx=0, unknown=0; @@ -1852,7 +1852,7 @@ static void add_assoc_image_info(pval *value, int sub_array, image_info_type *im #endif image_info_value *info_value; image_info_data *info_data; - pval *tmpi, *array = NULL; + zval *tmpi, *array = NULL; #ifdef EXIF_DEBUG /* php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Adding %d infos from section %s", image_info->info_list[section_index].count, exif_get_sectionname(section_index));*/ @@ -2248,7 +2248,7 @@ static char * exif_get_markername(int marker) Get headername for index or false if not defined */ PHP_FUNCTION(exif_tagname) { - pval **p_num; + zval **p_num; int tag, ac = ZEND_NUM_ARGS(); char *szTemp; @@ -3780,7 +3780,7 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t Reads header data from the JPEG/TIFF image filename and optionally reads the internal thumbnails */ PHP_FUNCTION(exif_read_data) { - pval **p_name, **p_sections_needed, **p_sub_arrays, **p_read_thumbnail, **p_read_all; + zval **p_name, **p_sections_needed, **p_sub_arrays, **p_read_thumbnail, **p_read_all; int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0, sub_arrays=0, read_thumbnail=0, read_all=0; image_info_type ImageInfo; char tmp[64], *sections_str, *s; diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c index 26496eb89d..0e0b0b1c0d 100644 --- a/ext/fbsql/php_fbsql.c +++ b/ext/fbsql/php_fbsql.c @@ -183,7 +183,7 @@ char *DigestPassword(char *user, char *password) /* {{{ fbsql_functions[] */ -function_entry fbsql_functions[] = { +zend_function_entry fbsql_functions[] = { PHP_FE(fbsql_connect, NULL) PHP_FE(fbsql_pconnect, NULL) PHP_FE(fbsql_close, NULL) diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c index 3ed745b1e3..2c944590a5 100644 --- a/ext/fdf/fdf.c +++ b/ext/fdf/fdf.c @@ -49,7 +49,7 @@ SAPI_POST_HANDLER_FUNC(fdf_post_handler); /* {{{ fdf_functions[] */ -function_entry fdf_functions[] = { +zend_function_entry fdf_functions[] = { PHP_FE(fdf_add_template, NULL) PHP_FE(fdf_close, NULL) PHP_FE(fdf_create, NULL) diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c index 8da055b729..6aff03c4dd 100644 --- a/ext/filepro/filepro.c +++ b/ext/filepro/filepro.c @@ -162,7 +162,7 @@ PHP_MSHUTDOWN_FUNCTION(filepro) } /* }}} */ -function_entry filepro_functions[] = { +zend_function_entry filepro_functions[] = { PHP_FE(filepro, NULL) PHP_FE(filepro_rowcount, NULL) PHP_FE(filepro_fieldname, NULL) diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 245f480cde..65d208ae37 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -51,7 +51,7 @@ static ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO() -function_entry php_ftp_functions[] = { +zend_function_entry php_ftp_functions[] = { PHP_FE(ftp_connect, NULL) #if HAVE_OPENSSL_EXT PHP_FE(ftp_ssl_connect, NULL) @@ -316,7 +316,7 @@ PHP_FUNCTION(ftp_chdir) Requests execution of a program on the FTP server */ PHP_FUNCTION(ftp_exec) { - pval *z_ftp; + zval *z_ftp; ftpbuf_t *ftp; char *cmd; int cmd_len; diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 0ebd3489ca..cbd5fd5aad 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -163,7 +163,7 @@ static void _php_image_bw_convert(gdImagePtr im_org, gdIOCtx *out, int threshold /* {{{ gd_functions[] */ -function_entry gd_functions[] = { +zend_function_entry gd_functions[] = { PHP_FE(gd_info, NULL) PHP_FE(imagearc, NULL) PHP_FE(imageellipse, NULL) diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index d47a0f6315..a979aaf492 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -32,7 +32,7 @@ /* {{{ php_gettext_functions[] */ -function_entry php_gettext_functions[] = { +zend_function_entry php_gettext_functions[] = { PHP_NAMED_FE(textdomain, zif_textdomain, NULL) PHP_NAMED_FE(gettext, zif_gettext, NULL) /* Alias for gettext() */ diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index d72a2d9828..cea27fadbc 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -39,7 +39,7 @@ static int le_gmp; /* {{{ gmp_functions[] */ -function_entry gmp_functions[] = { +zend_function_entry gmp_functions[] = { ZEND_FE(gmp_init, NULL) ZEND_FE(gmp_intval, NULL) ZEND_FE(gmp_strval, NULL) diff --git a/ext/hash/hash.c b/ext/hash/hash.c index a33cf2ea27..4c4e31a595 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -596,7 +596,7 @@ PHP_MINFO_FUNCTION(hash) /* {{{ hash_functions[] */ -function_entry hash_functions[] = { +zend_function_entry hash_functions[] = { PHP_FE(hash, NULL) PHP_FE(hash_file, NULL) diff --git a/ext/hwapi/hwapi.cpp b/ext/hwapi/hwapi.cpp index cc204b5b74..251ab73bcb 100644 --- a/ext/hwapi/hwapi.cpp +++ b/ext/hwapi/hwapi.cpp @@ -67,7 +67,7 @@ static zend_class_entry *hw_api_reason_class_entry_ptr; //} //#endif -function_entry hwapi_functions[] = { +zend_function_entry hwapi_functions[] = { PHP_FE(hwapi_dummy, NULL) PHP_FE(hwapi_init, NULL) PHP_FE(hwapi_hgcsp, NULL) @@ -102,7 +102,7 @@ function_entry hwapi_functions[] = { {NULL, NULL, NULL} }; -static function_entry php_hw_api_functions[] = { +static zend_function_entry php_hw_api_functions[] = { {"hgcsp", PHP_FN(hwapi_hgcsp), NULL}, {"object", PHP_FN(hwapi_object), NULL}, {"children", PHP_FN(hwapi_children), NULL}, @@ -148,7 +148,7 @@ static function_entry php_hw_api_functions[] = { {NULL, NULL, NULL} }; -static function_entry php_hw_api_object_functions[] = { +static zend_function_entry php_hw_api_object_functions[] = { {"hw_api_object", PHP_FN(hwapi_object_new), NULL}, {"count", PHP_FN(hwapi_object_count), NULL}, {"title", PHP_FN(hwapi_object_title), NULL}, @@ -161,7 +161,7 @@ static function_entry php_hw_api_object_functions[] = { {NULL, NULL, NULL} }; -static function_entry php_hw_api_attribute_functions[] = { +static zend_function_entry php_hw_api_attribute_functions[] = { {"hw_api_attribute", PHP_FN(hwapi_attribute_new), NULL}, {"key", PHP_FN(hwapi_attribute_key), NULL}, {"value", PHP_FN(hwapi_attribute_value), NULL}, @@ -170,20 +170,20 @@ static function_entry php_hw_api_attribute_functions[] = { {NULL, NULL, NULL} }; -static function_entry php_hw_api_error_functions[] = { +static zend_function_entry php_hw_api_error_functions[] = { {"count", PHP_FN(hwapi_error_count), NULL}, {"reason", PHP_FN(hwapi_error_reason), NULL}, {NULL, NULL, NULL} }; -static function_entry php_hw_api_content_functions[] = { +static zend_function_entry php_hw_api_content_functions[] = { {"hw_api_content", PHP_FN(hwapi_content_new), NULL}, {"read", PHP_FN(hwapi_content_read), NULL}, {"mimetype", PHP_FN(hwapi_content_mimetype), NULL}, {NULL, NULL, NULL} }; -static function_entry php_hw_api_reason_functions[] = { +static zend_function_entry php_hw_api_reason_functions[] = { {"type", PHP_FN(hwapi_reason_type), NULL}, {"description", PHP_FN(hwapi_reason_description), NULL}, {NULL, NULL, NULL} diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index e3f9ef83c4..ef88c5f258 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -64,7 +64,7 @@ /* {{{ iconv_functions[] */ -function_entry iconv_functions[] = { +zend_function_entry iconv_functions[] = { PHP_NAMED_FE(iconv,php_if_iconv, NULL) PHP_FE(ob_iconv_handler, NULL) PHP_FE(iconv_get_encoding, NULL) diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 8825244b48..88741cdd43 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -79,7 +79,7 @@ void *fs_get(size_t size); /* {{{ imap_functions[] */ -function_entry imap_functions[] = { +zend_function_entry imap_functions[] = { PHP_FE(imap_open, NULL) PHP_FE(imap_reopen, NULL) PHP_FE(imap_close, NULL) diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec index 8b988c818e..0473301c1c 100644 --- a/ext/informix/ifx.ec +++ b/ext/informix/ifx.ec @@ -140,7 +140,7 @@ typedef char IFX[128]; } \ } while (0) -function_entry ifx_functions[] = { +zend_function_entry ifx_functions[] = { PHP_FE(ifx_connect, NULL) PHP_FE(ifx_pconnect, NULL) PHP_FE(ifx_close, NULL) diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 14d25113b3..3af34b4623 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -36,7 +36,7 @@ #include "php_interbase.h" #include "php_ibase_includes.h" #include "SAPI.h" - +5B #include <time.h> #define ROLLBACK 0 @@ -44,7 +44,7 @@ #define RETAIN 2 /* {{{ extension definition structures */ -function_entry ibase_functions[] = { +zend_function_entry ibase_functions[] = { PHP_FE(ibase_connect, NULL) PHP_FE(ibase_pconnect, NULL) PHP_FE(ibase_close, NULL) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 777e6acdcc..8a388489f5 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -97,7 +97,7 @@ static int le_link, le_result, le_result_entry, le_ber_entry; */ /* {{{ ldap_functions[] */ -function_entry ldap_functions[] = { +zend_function_entry ldap_functions[] = { PHP_FE(ldap_connect, NULL) PHP_FALIAS(ldap_close, ldap_unbind, NULL) PHP_FE(ldap_bind, NULL) diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 9f982a125b..32bb207613 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -87,7 +87,7 @@ PHP_MINFO_FUNCTION(libxml); /* }}} */ /* {{{ extension definition structures */ -function_entry libxml_functions[] = { +zend_function_entry libxml_functions[] = { PHP_FE(libxml_set_streams_context, NULL) PHP_FE(libxml_use_internal_errors, NULL) PHP_FE(libxml_get_last_error, NULL) diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 376a8a4683..345b6b31de 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -43,7 +43,7 @@ typedef struct _php_mcrypt { zend_bool init; } php_mcrypt; -function_entry mcrypt_functions[] = { +zend_function_entry mcrypt_functions[] = { PHP_FE(mcrypt_ecb, NULL) PHP_FE(mcrypt_cbc, NULL) PHP_FE(mcrypt_cfb, NULL) diff --git a/ext/mhash/mhash.c b/ext/mhash/mhash.c index e0ad582acd..cbd619b63d 100644 --- a/ext/mhash/mhash.c +++ b/ext/mhash/mhash.c @@ -33,7 +33,7 @@ #include "php_globals.h" #include "ext/standard/info.h" -function_entry mhash_functions[] = { +zend_function_entry mhash_functions[] = { PHP_FE(mhash_get_block_size, NULL) PHP_FE(mhash_get_hash_name, NULL) PHP_FE(mhash_keygen_s2k, NULL) diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c index 8c9b957ca2..a74cd90e7b 100644 --- a/ext/mime_magic/mime_magic.c +++ b/ext/mime_magic/mime_magic.c @@ -218,7 +218,7 @@ ZEND_DECLARE_MODULE_GLOBALS(mime_magic) static magic_server_config_rec mime_global; /* {{{ mime_magic_functions[] */ -function_entry mime_magic_functions[] = { +zend_function_entry mime_magic_functions[] = { PHP_FE(mime_content_type, NULL) {NULL, NULL, NULL} }; diff --git a/ext/msession/msession.c b/ext/msession/msession.c index ffbe791c43..cd3b950d7b 100644 --- a/ext/msession/msession.c +++ b/ext/msession/msession.c @@ -120,7 +120,7 @@ static int s_port=8086; static void * s_conn=NULL; static REQB * s_reqb=NULL; -function_entry msession_functions[] = { +zend_function_entry msession_functions[] = { PHP_FE(msession_connect,NULL) PHP_FE(msession_disconnect,NULL) PHP_FE(msession_lock,NULL) diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index cc7454f550..9df8221e5b 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -46,7 +46,7 @@ static php_msql_globals msql_globals; /* {{{ msql_functions[] */ -function_entry msql_functions[] = { +zend_function_entry msql_functions[] = { PHP_FE(msql_connect, NULL) PHP_FE(msql_pconnect, NULL) PHP_FE(msql_close, NULL) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 052b0b51dc..5b8faf4e4b 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -123,7 +123,7 @@ typedef struct _php_mysql_conn { /* {{{ mysql_functions[] */ -function_entry mysql_functions[] = { +zend_function_entry mysql_functions[] = { PHP_FE(mysql_connect, NULL) PHP_FE(mysql_pconnect, NULL) PHP_FE(mysql_close, NULL) diff --git a/ext/ncurses/ncurses_fe.c b/ext/ncurses/ncurses_fe.c index 59f0a8b0e1..5fd55e3279 100644 --- a/ext/ncurses/ncurses_fe.c +++ b/ext/ncurses/ncurses_fe.c @@ -50,7 +50,7 @@ static * * Every user visible function must have an entry in ncurses_functions[]. */ -function_entry ncurses_functions[] = { +zend_function_entry ncurses_functions[] = { PHP_FE(ncurses_addch, NULL) #ifdef HAVE_NCURSES_COLOR_SET PHP_FE(ncurses_color_set, NULL) diff --git a/ext/ncurses/php_ncurses.h b/ext/ncurses/php_ncurses.h index 6b0ebcce6f..9bc862f087 100644 --- a/ext/ncurses/php_ncurses.h +++ b/ext/ncurses/php_ncurses.h @@ -36,7 +36,7 @@ extern int le_ncurses_panels; extern zend_module_entry ncurses_module_entry; #define phpext_ncurses_ptr &ncurses_module_entry -extern function_entry ncurses_functions[]; +extern zend_function_entry ncurses_functions[]; #include "php_ncurses_fe.h" #ifdef PHP_WIN32 diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c index 5c4c5ffd6a..fe5ebb263d 100644 --- a/ext/odbc/birdstep.c +++ b/ext/odbc/birdstep.c @@ -48,7 +48,7 @@ #include "php_birdstep.h" #include "ext/standard/info.h" -function_entry birdstep_functions[] = { +zend_function_entry birdstep_functions[] = { PHP_FE(birdstep_connect, NULL) PHP_FE(birdstep_close, NULL) PHP_FE(birdstep_exec, NULL) diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 2d13072082..1c3a7fbc2f 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -79,7 +79,7 @@ enum php_openssl_cipher_type { /* {{{ openssl_functions[] */ -function_entry openssl_functions[] = { +zend_function_entry openssl_functions[] = { /* public/private key functions */ PHP_FE(openssl_pkey_free, NULL) PHP_FE(openssl_pkey_new, NULL) diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index dc347a8fd7..30975e78e8 100755 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -43,7 +43,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pcntl) -function_entry pcntl_functions[] = { +zend_function_entry pcntl_functions[] = { PHP_FE(pcntl_fork, NULL) PHP_FE(pcntl_waitpid, second_arg_force_ref) PHP_FE(pcntl_wait, first_arg_force_ref) diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index a70af3ea48..3892005837 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1610,7 +1610,7 @@ PHP_FUNCTION(preg_grep) /* {{{ module definition structures */ -function_entry pcre_functions[] = { +zend_function_entry pcre_functions[] = { PHP_FE(preg_match, third_arg_force_ref) PHP_FE(preg_match_all, third_arg_force_ref) PHP_FE(preg_replace, NULL) diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 88a8203546..8e9ae2eec1 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -101,7 +101,7 @@ PHP_FUNCTION(pdo_drivers) /* }}} */ /* {{{ pdo_functions[] */ -function_entry pdo_functions[] = { +zend_function_entry pdo_functions[] = { PHP_FE(pdo_drivers, NULL) {NULL, NULL, NULL} }; diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 806b434d60..67c02579d3 100755 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -1083,7 +1083,7 @@ static PHP_METHOD(PDO, getAvailableDrivers) } /* }}} */ -function_entry pdo_dbh_functions[] = { +zend_function_entry pdo_dbh_functions[] = { ZEND_MALIAS(PDO, __construct, dbh_constructor, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDO, prepare, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDO, beginTransaction,NULL, ZEND_ACC_PUBLIC) @@ -1106,7 +1106,7 @@ function_entry pdo_dbh_functions[] = { /* {{{ overloaded object handlers for PDO class */ int pdo_hash_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) { - function_entry *funcs; + zend_function_entry *funcs; zend_function func; zend_internal_function *ifunc = (zend_internal_function*)&func; int namelen; diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index ee1181fae7..60eb726c06 100755 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -1965,7 +1965,7 @@ static PHP_METHOD(PDOStatement, __sleep) } /* }}} */ -function_entry pdo_dbstmt_functions[] = { +zend_function_entry pdo_dbstmt_functions[] = { PHP_ME(PDOStatement, execute, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDOStatement, fetch, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDOStatement, bindParam, second_arg_force_ref, ZEND_ACC_PUBLIC) @@ -2302,7 +2302,7 @@ zend_object_iterator *pdo_stmt_iter_get(zend_class_entry *ce, zval *object TSRML /* {{{ overloaded handlers for PDORow class (used by PDO_FETCH_LAZY) */ -function_entry pdo_row_functions[] = { +zend_function_entry pdo_row_functions[] = { {NULL, NULL, NULL} }; diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h index 38f65d6af2..2edb997668 100755 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h @@ -284,7 +284,7 @@ enum { PDO_DBH_DRIVER_METHOD_KIND__MAX }; -typedef function_entry *(*pdo_dbh_get_driver_methods_func)(pdo_dbh_t *dbh, int kind TSRMLS_DC); +typedef zend_function_entry *(*pdo_dbh_get_driver_methods_func)(pdo_dbh_t *dbh, int kind TSRMLS_DC); struct pdo_dbh_methods { pdo_dbh_close_func closer; diff --git a/ext/pdo/php_pdo_int.h b/ext/pdo/php_pdo_int.h index e7c2487b58..c00a7034ad 100755 --- a/ext/pdo/php_pdo_int.h +++ b/ext/pdo/php_pdo_int.h @@ -32,12 +32,12 @@ void pdo_dbh_init(TSRMLS_D); void pdo_stmt_init(TSRMLS_D); extern zend_object_value pdo_dbh_new(zend_class_entry *ce TSRMLS_DC); -extern function_entry pdo_dbh_functions[]; +extern zend_function_entry pdo_dbh_functions[]; extern zend_class_entry *pdo_dbh_ce; extern ZEND_RSRC_DTOR_FUNC(php_pdo_pdbh_dtor); extern zend_object_value pdo_dbstmt_new(zend_class_entry *ce TSRMLS_DC); -extern function_entry pdo_dbstmt_functions[]; +extern zend_function_entry pdo_dbstmt_functions[]; extern zend_class_entry *pdo_dbstmt_ce; void pdo_dbstmt_free_storage(pdo_stmt_t *stmt TSRMLS_DC); zend_object_iterator *pdo_stmt_iter_get(zend_class_entry *ce, zval *object TSRMLS_DC); @@ -46,7 +46,7 @@ int pdo_stmt_describe_columns(pdo_stmt_t *stmt TSRMLS_DC); int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, int skip_first_arg); extern zend_object_value pdo_row_new(zend_class_entry *ce TSRMLS_DC); -extern function_entry pdo_row_functions[]; +extern zend_function_entry pdo_row_functions[]; extern zend_class_entry *pdo_row_ce; void pdo_row_free_storage(pdo_stmt_t *stmt TSRMLS_DC); extern zend_object_handlers pdo_row_object_handlers; diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c index f96d8accbe..c63a700932 100644 --- a/ext/pdo_dblib/pdo_dblib.c +++ b/ext/pdo_dblib/pdo_dblib.c @@ -34,7 +34,7 @@ ZEND_DECLARE_MODULE_GLOBALS(dblib) -function_entry pdo_dblib_functions[] = { +zend_function_entry pdo_dblib_functions[] = { {NULL, NULL, NULL} }; diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c index d936c0e54e..9b6f5336c0 100644 --- a/ext/pdo_firebird/pdo_firebird.c +++ b/ext/pdo_firebird/pdo_firebird.c @@ -30,7 +30,7 @@ #include "php_pdo_firebird.h" #include "php_pdo_firebird_int.h" -function_entry pdo_firebird_functions[] = { /* {{{ */ +zend_function_entry pdo_firebird_functions[] = { /* {{{ */ {NULL, NULL, NULL} }; /* }}} */ diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 119f7e0a2f..7569004a4e 100755 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -31,7 +31,7 @@ #include "php_pdo_mysql_int.h" /* {{{ pdo_mysql_functions[] */ -function_entry pdo_mysql_functions[] = { +zend_function_entry pdo_mysql_functions[] = { {NULL, NULL, NULL} }; /* }}} */ diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c index d5d0df5f0b..dfb23d50be 100755 --- a/ext/pdo_oci/pdo_oci.c +++ b/ext/pdo_oci/pdo_oci.c @@ -31,7 +31,7 @@ #include "php_pdo_oci_int.h" /* {{{ pdo_oci_functions[] */ -function_entry pdo_oci_functions[] = { +zend_function_entry pdo_oci_functions[] = { {NULL, NULL, NULL} }; /* }}} */ diff --git a/ext/pdo_pgsql/pdo_pgsql.c b/ext/pdo_pgsql/pdo_pgsql.c index e48338a27b..e339cd92c0 100644 --- a/ext/pdo_pgsql/pdo_pgsql.c +++ b/ext/pdo_pgsql/pdo_pgsql.c @@ -31,7 +31,7 @@ #include "php_pdo_pgsql_int.h" /* {{{ pdo_pgsql_functions[] */ -function_entry pdo_pgsql_functions[] = { +zend_function_entry pdo_pgsql_functions[] = { {NULL, NULL, NULL} }; /* }}} */ diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 65fb948675..2a3eb2bc54 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -580,14 +580,14 @@ static PHP_METHOD(PDO, pgsqlLOBUnlink) /* }}} */ -static function_entry dbh_methods[] = { +static zend_function_entry dbh_methods[] = { PHP_ME(PDO, pgsqlLOBCreate, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDO, pgsqlLOBOpen, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDO, pgsqlLOBUnlink, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; -static function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) +static zend_function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) { switch (kind) { case PDO_DBH_DRIVER_METHOD_KIND_DBH: diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c index edcfa31d85..20440a0f5d 100644 --- a/ext/pdo_sqlite/pdo_sqlite.c +++ b/ext/pdo_sqlite/pdo_sqlite.c @@ -34,7 +34,7 @@ #define PHP_PDO_SQLITE_MODULE_VERSION "1.0.1" /* {{{ pdo_sqlite_functions[] */ -function_entry pdo_sqlite_functions[] = { +zend_function_entry pdo_sqlite_functions[] = { {NULL, NULL, NULL} }; /* }}} */ diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index ff935ab031..a046969b2d 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -584,13 +584,13 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate) RETURN_FALSE; } /* }}} */ -static function_entry dbh_methods[] = { +static zend_function_entry dbh_methods[] = { PHP_ME(SQLite, sqliteCreateFunction, NULL, ZEND_ACC_PUBLIC) PHP_ME(SQLite, sqliteCreateAggregate, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; -static function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) +static zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) { switch (kind) { case PDO_DBH_DRIVER_METHOD_KIND_DBH: diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 20ea794673..bc5444aac5 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -77,7 +77,7 @@ /* {{{ pgsql_functions[] */ -function_entry pgsql_functions[] = { +zend_function_entry pgsql_functions[] = { /* connection functions */ PHP_FE(pg_connect, NULL) PHP_FE(pg_pconnect, NULL) diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 890609e565..6535918add 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -52,7 +52,7 @@ ZEND_DECLARE_MODULE_GLOBALS(posix) /* {{{ posix_functions[] */ -function_entry posix_functions[] = { +zend_function_entry posix_functions[] = { /* POSIX.1, 3.3 */ PHP_FE(posix_kill, NULL) diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c index b337632963..29c74507ab 100644 --- a/ext/pspell/pspell.c +++ b/ext/pspell/pspell.c @@ -52,7 +52,7 @@ /* {{{ pspell_functions[] */ -function_entry pspell_functions[] = { +zend_function_entry pspell_functions[] = { PHP_FE(pspell_new, NULL) PHP_FE(pspell_new_personal, NULL) PHP_FE(pspell_new_config, NULL) diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 0888cdd61a..4de1115a72 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -253,7 +253,7 @@ PHP_FUNCTION(readline_info) Adds a line to the history */ PHP_FUNCTION(readline_add_history) { - pval **arg; + zval **arg; int ac = ZEND_NUM_ARGS(); if (ac != 1 || zend_get_parameters_ex(ac, &arg) == FAILURE) { @@ -312,7 +312,7 @@ PHP_FUNCTION(readline_list_history) Reads the history */ PHP_FUNCTION(readline_read_history) { - pval **arg; + zval **arg; char *filename = NULL; int ac = ZEND_NUM_ARGS(); @@ -339,7 +339,7 @@ PHP_FUNCTION(readline_read_history) Writes the history */ PHP_FUNCTION(readline_write_history) { - pval **arg; + zval **arg; char *filename = NULL; int ac = ZEND_NUM_ARGS(); diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 5258c4850e..3bf4c1fb52 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4146,7 +4146,7 @@ static zend_function_entry reflection_extension_functions[] = { }; /* }}} */ -function_entry reflection_ext_functions[] = { /* {{{ */ +zend_function_entry reflection_ext_functions[] = { /* {{{ */ {NULL, NULL, NULL} }; /* }}} */ diff --git a/ext/session/session.c b/ext/session/session.c index 2b7df6406f..e353fa913d 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -56,7 +56,7 @@ /* {{{ session_functions[] */ -function_entry session_functions[] = { +zend_function_entry session_functions[] = { PHP_FE(session_name, NULL) PHP_FE(session_module_name, NULL) PHP_FE(session_save_path, NULL) diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c index 1a84e1edb9..882143dc5b 100644 --- a/ext/shmop/shmop.c +++ b/ext/shmop/shmop.c @@ -47,7 +47,7 @@ int shm_type; /* {{{ shmop_functions[] */ -function_entry shmop_functions[] = { +zend_function_entry shmop_functions[] = { PHP_FE(shmop_open, NULL) PHP_FE(shmop_read, NULL) PHP_FE(shmop_close, NULL) diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 310f3718d3..fd2e721521 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1925,7 +1925,7 @@ PHP_FUNCTION(simplexml_import_dom) } /* }}} */ -function_entry simplexml_functions[] = { +zend_function_entry simplexml_functions[] = { PHP_FE(simplexml_load_file, NULL) PHP_FE(simplexml_load_string, NULL) PHP_FE(simplexml_import_dom, NULL) diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 3106138e99..029b8f5cf7 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -113,7 +113,7 @@ static oid objid_mib[] = {1, 3, 6, 1, 2, 1}; /* {{{ snmp_functions[] */ -function_entry snmp_functions[] = { +zend_function_entry snmp_functions[] = { PHP_FE(snmpget, NULL) PHP_FE(snmpgetnext, NULL) PHP_FE(snmpwalk, NULL) diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c index f4332300a5..7aa4866d43 100644 --- a/ext/snmp/winsnmp.c +++ b/ext/snmp/winsnmp.c @@ -21,7 +21,7 @@ Created from the snmputil sample in the Microsoft SDK for NT /* {{{ snmp_functions[] */ -function_entry snmp_functions[] = { +zend_function_entry snmp_functions[] = { {"snmpget", php3_snmpget, NULL}, {"snmpwalk", php3_snmpwalk, NULL}, {NULL,NULL,NULL} @@ -58,7 +58,7 @@ DLEXPORT zend_module_entry *get_module() { return &snmp_module_entry; } /* {{{ _php_snmp */ void _php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st) { - pval *a1, *a2, *a3; + zval *a1, *a2, *a3; INT operation; LPSTR agent; LPSTR community; diff --git a/ext/soap/soap.c b/ext/soap/soap.c index c71c73ce7d..a339f46716 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2840,7 +2840,7 @@ PHP_METHOD(SoapClient, __setLocation) #ifndef ZEND_ENGINE_2 static void soap_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference) { - pval *object = property_reference->object; + zval *object = property_reference->object; zend_overloaded_element *function_name = (zend_overloaded_element *)property_reference->elements_list->tail->data; char *function = Z_STRVAL(function_name->element); zend_function *builtin_function; diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index e36522b5cd..a424a31fdf 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -112,7 +112,7 @@ static /* {{{ sockets_functions[] */ -function_entry sockets_functions[] = { +zend_function_entry sockets_functions[] = { PHP_FE(socket_select, first_through_third_args_force_ref) PHP_FE(socket_create, NULL) PHP_FE(socket_create_listen, NULL) diff --git a/ext/sqlite/pdo_sqlite2.c b/ext/sqlite/pdo_sqlite2.c index bd2cd0768e..5efa99c8b1 100644 --- a/ext/sqlite/pdo_sqlite2.c +++ b/ext/sqlite/pdo_sqlite2.c @@ -477,12 +477,12 @@ static PHP_FUNCTION(sqlite2_create_function) /* TODO: implement this stuff */ } -static function_entry dbh_methods[] = { +static zend_function_entry dbh_methods[] = { PHP_FE(sqlite2_create_function, NULL) {NULL, NULL, NULL} }; -static function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) +static zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) { switch (kind) { case PDO_DBH_DRIVER_METHOD_KIND_DBH: diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c index b45dffbbd3..5cb2518a80 100644 --- a/ext/sqlite/sqlite.c +++ b/ext/sqlite/sqlite.c @@ -163,7 +163,7 @@ static int php_sqlite_fetch(struct php_sqlite_result *rres TSRMLS_DC); enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM }; -function_entry sqlite_functions[] = { +zend_function_entry sqlite_functions[] = { PHP_FE(sqlite_open, third_arg_force_ref) PHP_FE(sqlite_popen, third_arg_force_ref) PHP_FE(sqlite_close, NULL) @@ -206,7 +206,7 @@ function_entry sqlite_functions[] = { {NULL, NULL, NULL} }; -function_entry sqlite_funcs_db[] = { +zend_function_entry sqlite_funcs_db[] = { PHP_ME_MAPPING(__construct, sqlite_open, third_arg_force_ref) /* PHP_ME_MAPPING(close, sqlite_close, NULL)*/ PHP_ME_MAPPING(query, sqlite_query, third_arg_force_ref) @@ -226,7 +226,7 @@ function_entry sqlite_funcs_db[] = { {NULL, NULL, NULL} }; -function_entry sqlite_funcs_query[] = { +zend_function_entry sqlite_funcs_query[] = { PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL) PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL) PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL) @@ -250,7 +250,7 @@ function_entry sqlite_funcs_query[] = { {NULL, NULL, NULL} }; -function_entry sqlite_funcs_ub_query[] = { +zend_function_entry sqlite_funcs_ub_query[] = { PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL) PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL) PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL) @@ -265,7 +265,7 @@ function_entry sqlite_funcs_ub_query[] = { {NULL, NULL, NULL} }; -function_entry sqlite_funcs_exception[] = { +zend_function_entry sqlite_funcs_exception[] = { {NULL, NULL, NULL} }; diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c index 6cd6db1b03..8ac53efa6e 100644 --- a/ext/sybase/php_sybase_db.c +++ b/ext/sybase/php_sybase_db.c @@ -80,7 +80,7 @@ typedef struct { } sybase_result; -function_entry sybase_functions[] = { +zend_function_entry sybase_functions[] = { PHP_FE(sybase_connect, NULL) PHP_FE(sybase_pconnect, NULL) PHP_FE(sybase_close, NULL) diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c index 20517b6f60..f706445b94 100644 --- a/ext/sybase_ct/php_sybase_ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -37,7 +37,7 @@ static int le_link, le_plink, le_result; #if HAVE_SYBASE_CT -function_entry sybase_functions[] = { +zend_function_entry sybase_functions[] = { PHP_FE(sybase_connect, NULL) PHP_FE(sybase_pconnect, NULL) PHP_FE(sybase_close, NULL) diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index 951282e9dc..affa6e20ad 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/ext/sysvmsg/sysvmsg.c @@ -66,7 +66,7 @@ static * * Every user visible function must have an entry in sysvmsg_functions[]. */ -function_entry sysvmsg_functions[] = { +zend_function_entry sysvmsg_functions[] = { PHP_FE(msg_get_queue, NULL) PHP_FE(msg_send, sixth_arg_force_ref) PHP_FE(msg_receive, msg_receive_args_force_ref) diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index 2602bdf1bd..a0b4ef2ca7 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -58,7 +58,7 @@ union semun { /* {{{ sysvsem_functions[] */ -function_entry sysvsem_functions[] = { +zend_function_entry sysvsem_functions[] = { PHP_FE(sem_get, NULL) PHP_FE(sem_acquire, NULL) PHP_FE(sem_release, NULL) diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index 34c7e1cb66..6d53fb520e 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -40,7 +40,7 @@ /* {{{ sysvshm_functions[] */ -function_entry sysvshm_functions[] = { +zend_function_entry sysvshm_functions[] = { PHP_FE(shm_attach, NULL) PHP_FE(shm_remove, NULL) PHP_FE(shm_detach, NULL) diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 89a7132e86..5e4075e48c 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -237,7 +237,7 @@ STD_PHP_INI_ENTRY("tidy.default_config", "", PHP_INI_SYSTEM, OnUpdateString, d PHP_INI_ENTRY("tidy.clean_output", "0", PHP_INI_PERDIR, NULL) PHP_INI_END() -function_entry tidy_functions[] = { +zend_function_entry tidy_functions[] = { PHP_FE(tidy_getopt, NULL) PHP_FE(tidy_parse_string, NULL) PHP_FE(tidy_parse_file, NULL) @@ -268,7 +268,7 @@ function_entry tidy_functions[] = { {NULL, NULL, NULL} }; -function_entry tidy_funcs_doc[] = { +zend_function_entry tidy_funcs_doc[] = { TIDY_METHOD_MAP(getOpt, tidy_getopt, NULL) TIDY_METHOD_MAP(cleanRepair, tidy_clean_repair, NULL) TIDY_DOC_ME(parseFile, NULL) @@ -293,7 +293,7 @@ function_entry tidy_funcs_doc[] = { {NULL, NULL, NULL} }; -function_entry tidy_funcs_node[] = { +zend_function_entry tidy_funcs_node[] = { TIDY_NODE_ME(__construct, NULL) TIDY_NODE_ME(hasChildren, NULL) TIDY_NODE_ME(hasSiblings, NULL) @@ -306,7 +306,7 @@ function_entry tidy_funcs_node[] = { {NULL, NULL, NULL} }; -function_entry tidy_funcs_exception[] = { +zend_function_entry tidy_funcs_exception[] = { {NULL, NULL, NULL} }; diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index ce79eedab7..23e7baa633 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -103,7 +103,7 @@ ZEND_DECLARE_MODULE_GLOBALS(tokenizer) * * Every user visible function must have an entry in tokenizer_functions[]. */ -function_entry tokenizer_functions[] = { +zend_function_entry tokenizer_functions[] = { PHP_FE(token_get_all, NULL) PHP_FE(token_name, NULL) {NULL, NULL, NULL} /* Must be the last line in tokenizer_functions[] */ diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index e6f993590c..c6708f0778 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -99,7 +99,7 @@ static void php_wddx_process_data(void *user_data, const XML_Char *s, int len); /* {{{ wddx_functions[] */ -function_entry wddx_functions[] = { +zend_function_entry wddx_functions[] = { PHP_FE(wddx_serialize_value, NULL) PHP_FE(wddx_serialize_vars, NULL) PHP_FE(wddx_packet_start, NULL) diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 67521253e4..033e8ffc7e 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -111,7 +111,7 @@ static ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); -function_entry xml_functions[] = { +zend_function_entry xml_functions[] = { PHP_FE(xml_parser_create, NULL) PHP_FE(xml_parser_create_ns, NULL) PHP_FE(xml_set_object, second_arg_force_ref) diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 162e2059ee..0f07d00d1e 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -80,7 +80,7 @@ ZEND_DECLARE_MODULE_GLOBALS(xmlrpc) static int le_xmlrpc_server; -function_entry xmlrpc_functions[] = { +zend_function_entry xmlrpc_functions[] = { PHP_FE(xmlrpc_encode, NULL) PHP_FE(xmlrpc_decode, NULL) PHP_FE(xmlrpc_decode_request, second_arg_force_ref) @@ -1330,7 +1330,7 @@ int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype) if(v) { time_t timestamp = XMLRPC_GetValueDateTime(v); if(timestamp) { - pval* ztimestamp; + zval* ztimestamp; MAKE_STD_ZVAL(ztimestamp); diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index 7959e03726..dd0395e41f 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -38,7 +38,7 @@ static zend_object_handlers xsl_object_handlers; * * Every user visible function must have an entry in xsl_functions[]. */ -function_entry xsl_functions[] = { +zend_function_entry xsl_functions[] = { {NULL, NULL, NULL} /* Must be the last line in xsl_functions[] */ }; /* }}} */ diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 19e49ac840..d8d0a7e45b 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -86,7 +86,7 @@ static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ /* {{{ php_zlib_functions[] */ -function_entry php_zlib_functions[] = { +zend_function_entry php_zlib_functions[] = { PHP_FE(readgzfile, NULL) PHP_FALIAS(gzrewind, rewind, NULL) PHP_FALIAS(gzclose, fclose, NULL) |