- Nuke php3 legacy

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 26c9e42ae667547a6f1650872e6a2e948f978466..63aebc597d155cc8c2afc1410394d992b9f968fa 100644 (file)
--- 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 f3939c5ea3f83d4c01254a172fa19aa7541c9f4c..8468a6a8f38c6bd147c89bdf01307359f2f3f4a2 100644 (file)
--- 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 a455eb09ae7f46dcd319f79278078c8ac7de9b9d..3788aa42066ad64e90d0cd77646e08c49ac4ce6e 100644 (file)
--- 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 5ec4b3cd614459cb192d8240b9c9d4779babcc0a..9e2f65176ce7b65d41b8e638e9f2f33155c92961 100644 (file)
--- 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 de48ea943a1acc6ff8ac95b76c573e59e76f883e..3cba3ebb7d58e6906b04a46b1b5e92ad5cfba754 100644 (file)
--- 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 9a5eb32330177cf9f3ebab25548977f12a774690..53420058b6dbdc74feb6e693bbd9d947659dd433 100644 (file)
--- 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 6b84c993612e49e8ae73dc4dbfff30e649b7e249..cf32b3e025b299ddbfa346f233b8e4be5f24c973 100644 (file)
--- 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 4940a7b1a4f9e555beac86ad7e7da770dc244e4e..4cd5baf268c0cf3fadaa165061d4bec5fe6ad500 100644 (file)
--- 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 764fc9fc053a1f8774e1d34efdf4ce5a16c578c1..82d26f7d4f7ee50bbee2123e5086d74084243461 100644 (file)
--- 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 378abc405e5123271ef5a84a6206b84548e291e3..5d1955c679e2eaaf79aa2584530114c543478e26 100644 (file)
--- 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 db4798b4bd88156ca6883e60b15dcbfa575e9c59..a6d184543dfcea7f2da47439301495b5c279803c 100644 (file)
--- 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, U_CLASS_ENTRY(dom_nodelist_class_entry), &index) == FAILURE) {
                return;

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index dca6d85201d2e3fe9ad276335c423a9f73f90b77..f9ec894c41c45dcdd87a29ea88b41b93cc45e872 100644 (file)
--- 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 26496eb89db1971c4ba6e24f6a6a065b42b92ed5..0e0b0b1c0d9d3cb6b4651b83521b3ff8fc3d3e56 100644 (file)
--- 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 66ec51d9962d012425f67666895aec21709def77..2f596711de6e97ea2b4d6db0eb41a96bca92ea02 100644 (file)
--- 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 8da055b729312f5243aa02fb1c3055e81f41afa2..6aff03c4dd2b62546009f5c147b1b2ccaf99f702 100644 (file)
--- 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 245f480cde5cc54371399b98eeadbc3998495c16..65d208ae37abde2bc9219ade1b599975f487b7c2 100644 (file)
--- 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 2109a1d2da7ca982e22b5b15b6ea5b50633c19d8..3c1a7aa2c11f91298531814affade11fdf221582 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -159,7 +159,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 d47a0f6315bafd46cb0c301ba51cc538a2787bec..a979aaf492c243a45e9bfb4efe2d0cde97cbb9b5 100644 (file)
--- 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 d72a2d9828c4306cdbf7e20019f395b0d4116e50..cea27fadbc8c75bfc2ce061280676d0de086e3b1 100644 (file)
--- 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 a33cf2ea27ccf197a0034de785a8978a0fefcd59..4c4e31a5952d4632eb51ff2adb80624f73e83497 100644 (file)
--- 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 cc204b5b74aa6d53c5482489a39d422ab81ae5ae..251ab73bcbf2fe24cd61ba35663224aa6b795540 100644 (file)
--- 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 4ad189587ea3f920a17a1e99b0d681f3c12de6b0..191ea75baff65dcb3a2c701bcb3d54768f870552 100644 (file)
--- 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 8825244b482fdbd5a0512d74e37431f96e4c0648..88741cdd438aa8b078820b0fd6746e82f421f4b5 100644 (file)
--- 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 8b988c818e767cf33e188f12bde26cd2284bdc7f..0473301c1c5714e90a184ee962073da40e50e5c4 100644 (file)
--- 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 14d25113b372c70676843723ee263bdcc9b919ef..3af34b4623833dae09c35ecc98d6f895977bfb00 100644 (file)
--- 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 bffe17c11b2fcf760b7a6ef2e26acaba913d2ec0..8e4d7c47f167895ad495a2dfc9b9ccd7aaacbcbe 100644 (file)
--- 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 0ac351d9979cee3274bed68b776cb9616b11d3b8..07704b49af128530daef75d2de095c7e85150f33 100644 (file)
--- 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 5d0183bfc012bf799ba47af379467321747b434c..97ee846a4678d9bb8c2fa83549da1acd269a9c6e 100644 (file)
--- 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 e0ad582acd10790e306da201581c7e9b67eac1cb..cbd619b63dc9b0cef68294992bae1436fd37fbbb 100644 (file)
--- 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 c627d64730c433447d2e6dfe6bf274923ff4a8e5..239d14d9e80b620b982fc3f3b8b4ef7d67658be2 100644 (file)
--- 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 ffbe791c434a2853f8523c77e51477c6b42c6a24..cd3b950d7bb2148453366b349a1c445f7125ce35 100644 (file)
--- 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 cc7454f550d7dfdfefedf998a5add46e3d969adf..9df8221e5b9e2dfdc368e23305f152e2e3aeab7b 100644 (file)
--- 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 5a6dd7cae5a8973e93a697c1a33ee66b975182ba..b5d4a5770d646264c21b1f5070fd181601556f0e 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -116,7 +116,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 59f0a8b0e1db68bffcf37f65b1582f96005c3e90..5fd55e327928a12cec9a84e40c279fbceb52f367 100644 (file)
--- 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 6b0ebcce6f417678e394cbe06744017cb14d26fc..9bc862f0872fb0b4698e278b508a246ff7003c34 100644 (file)
--- 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 5c4c5ffd6a6dbb7ef96f75a95462f866596ab316..fe5ebb263d18853e59d331d5c6be9b032b6b50e0 100644 (file)
--- 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 2d13072082bd4bb1bf47d483e4d2584c1443a0e9..1c3a7fbc2f2eb5d20df36f28490226311336a747 100644 (file)
--- 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 94af3d64cea84ad7e8736f65481a67fe2dae7959..a226e39eb66af7b4214d013d59259440b2944ba2 100755 (executable)
--- 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 4e11c53f7c805d7c7ec4492bf5295681504a8822..55b2624a932d15a93b9210950ec7fd3ba858def5 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1621,7 +1621,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 0aeb0734ef3c37deca1de11c8cef018f35a10b2a..fbd644a6aff9bcff6c3477e1cc5034f65758920e 100755 (executable)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -108,7 +108,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 cf68449328a491670ba257b21caae264fb84e8c9..34eb360488eed7b8af8bf2809cf2534cc7c974c9 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -1081,7 +1081,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)
@@ -1104,7 +1104,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 021586b90b923914a824a1b080507a23feee7d3c..75b51d950b5c3e2dcb3864b80cd34ac117e50e64 100755 (executable)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -1909,7 +1909,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)
@@ -2238,7 +2238,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 d0543cb2c1f09231c399c222235a3e87802a51cd..4d4b6bfdc6e6c2cf32ad01ed8b2613542067e123 100755 (executable)
--- 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 6bca408d542219afad00b2825df21c17e82cc413..8042d9a3fd968388a74894458fe5489e5ddfa743 100755 (executable)
--- a/ext/pdo/php_pdo_int.h
+++ b/ext/pdo/php_pdo_int.h
@@ -34,12 +34,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);
@@ -48,7 +48,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 0c1db0e31091130481cd58a686a9728c66477cf5..1124961185f26ef1b2dfabd4b9658d35264290c4 100644 (file)
--- 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 1413a61ba0aadf933642f45330e145bcb0a0e76e..d56f3b6a7d680f5d836aa73930a388aec875d124 100644 (file)
--- 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 77a0ca6b9d051f90be8d7c01c3c5537c14e9254e..90f0c030bba1ff2ba549061c0fc71b8a6037569e 100755 (executable)
--- 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 6ab7bc887cbc9d4ddac4ab2f6bcb587257d3a298..66cb2cc66d51bf715dd1df8e97f9cbac9aa6f87a 100755 (executable)
--- 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 e11fa881ab790e66fc1a77219229d616b02ff845..cdf40bb2b8533df353c8c862d2c41ab652363ff6 100644 (file)
--- 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_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c
index 7e3ebe866b4c14ca2d63628febbe7ea87587fd4c..109df7b2aebdd281b47be13c93eab1ad01296d79 100644 (file)
--- a/ext/pdo_sqlite/pdo_sqlite.c
+++ b/ext/pdo_sqlite/pdo_sqlite.c
@@ -34,7 +34,7 @@
 #define PHP_PDO_SQLITE_MODULE_VERSION  "0.9"
 
 /* {{{ 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 7c004a7ebb0a76cf914592d4e94b0eb590958559..319c9109ba7f10d77904b0ea072871fc6d5fdcf1 100644 (file)
--- a/ext/pdo_sqlite/sqlite_driver.c
+++ b/ext/pdo_sqlite/sqlite_driver.c
@@ -619,13 +619,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 da85ee982a08a4b6d917d4bd17a522c05269b50a..90fbd18577697af82b1f17d31fbd32082555f4ff 100644 (file)
--- 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 890609e565f7e805a8cefac2ec93d12e3d8d9a5d..6535918adda578415c488f8c5645ea94eaf0d98a 100644 (file)
--- 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 b3376329631cae35ee4604dc083cd8cbc7a57592..29c74507ab22cabf20db10ca5c198d29cd7159b3 100644 (file)
--- 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 071bb0810fcc34b0fa67942a94ba844f65fcc0ec..223b5b36ca747687a8e782262915ccd55cccacf8 100644 (file)
--- 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 259e74384a8b455ef02a90671c5b75b3710ea6f0..bd7417c83595e98e78b3c96626902e39495e07c0 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -4164,7 +4164,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 fd32a77a61b161bd4ae554b8a4fdfe769e041ecb..d2b63bccb8daa7893ad219a31a4b2598a4e33711 100644 (file)
--- 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 1a84e1edb9b27e29b684d3863d29f9e587a40855..882143dc5b39c01c94df8057e8dc263a2d8f2de3 100644 (file)
--- 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 f1c4a73b09fa60b80d58e80d3fa6ff3769ee2ac4..6d2b2b2efe148e3d6cd1743b947895ca79333961 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1936,7 +1936,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 3106138e99da5c05fc337ae30b3f874cd48589be..029b8f5cf78476ffad5e8322ba3665a4ed493d3a 100644 (file)
--- 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 f4332300a540dc8c9fdedc9b09d47e881ca00a94..7aa4866d43bf93d5b60f9c39cd2680cb29010544 100644 (file)
--- 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 74cfec7483eaccd5e12fe254f1166c751ed4d3e8..e7dbacd21c3a39766aa814df681a6f26892d0260 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2834,7 +2834,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 2b7085c18d9276926c96b421334315ed9cedec6e..fa5c56eb6eb5636009da8c2b6b6a10f93fb21964 100644 (file)
--- 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 b4e857d5b17d9c876b591655e625ce5b898033a1..8723ae6441c9e07a5f4b1fbbc3af5d97ef8e02c8 100644 (file)
--- 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 6c3f1c4dcdd3f30059d3f4a818cb2a72ec74f994..9fbdf75835f685616bc7f4cc74f6debeb426f15f 100644 (file)
--- 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 6cd6db1b03574d8684947baa4c6b67e60b3a97a9..8ac53efa6ed772fe5d6ea3f9ef3b8ed66259be0e 100644 (file)
--- 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 efaeb9b8db9d6f9a404bed79c85f36de51ef67be..f5cf482b863232296ae21d9bab602a1129d04d36 100644 (file)
--- 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 951282e9dcc8860a39c8c0cb353bc048fb9c46d2..affa6e20add6f98fdf28e598caa3eb5662c68bd6 100644 (file)
--- 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 2602bdf1bd8e6cb325dc85d34f7ca8506df06864..a0b4ef2ca7e641ff92eb9778fbef57bec9eb4e13 100644 (file)
--- 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 34c7e1cb669076fd606d013450254db46a5d7142..6d53fb520e15e5b955f0753357e6e761e076884a 100644 (file)
--- 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 24fb87f1e3f5f408b5bcbbc7f04082c506c1cafd..9e832dc102f3ac014dbec711d46ecb1ada4e9bd9 100644 (file)
--- 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 b94abfdfd3857ffd9f5a6674b46a2b6e69ae7896..7503beea94e45c6c4b2bb33a5083ba910a46a1aa 100644 (file)
--- 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/unicode/unicode.c b/ext/unicode/unicode.c
index 88759f4d23cf53a29f9b51f7616b98e0884f1f2d..81917cec6b34dbe4cb9cf1c7c76bdbe486f13332 100644 (file)
--- a/ext/unicode/unicode.c
+++ b/ext/unicode/unicode.c
@@ -101,7 +101,7 @@ static PHP_FUNCTION(unicode_encode)
        ucnv_close(conv);       
 }
 /* {{{ unicode_functions[] */
-function_entry unicode_functions[] = {
+zend_function_entry unicode_functions[] = {
        PHP_FE(i18n_loc_get_default, NULL)
        PHP_FE(i18n_loc_set_default, NULL)
        PHP_FE(unicode_decode, NULL)

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index a3b629f9d7eada6a8a910c7a901e79927055861b..47c0430a6965ab9feba212f35922c1d8f872076c 100644 (file)
--- 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 7f17d68a5005b0fd6ffba126ce902c08a067578c..4957cda2287293ef06227b9eb544af9dbb1e6c83 100644 (file)
--- 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 b3be29cabdc9fce51e3c6a824ce73e26ef8dd0c0..1ed9031199ef01923fbf367a021c980020636e7c 100644 (file)
--- 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)
@@ -1329,7 +1329,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 7959e037261604d55163b13c2e83587ff578e91f..dd0395e41f101b794d61c60d4727a4e3deff8a07 100644 (file)
--- 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 19e49ac8401aaf6b4621daddaf006f0dce0c03fb..d8d0a7e45bcc24b9ea2553bfe722d0d52a5f653b 100644 (file)
--- 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)

diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index c04418aeb60183a25c2bd3521082d0a722bda8b0..da289c99d143112fdc9b27c88dc70c8a9f473b0f 100644 (file)
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -240,7 +240,7 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS)
 
 PHP_FUNCTION(getallheaders);
 
-static function_entry aolserver_functions[] = {
+static zend_function_entry aolserver_functions[] = {
        PHP_FE(getallheaders, NULL)
        {NULL, NULL, NULL}
 };

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 787d09a05724d6cbf018804cf9213aa708cad28a..cbc842fd9fa3e622d568deaba62998da3d70df2d 100644 (file)
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -51,7 +51,7 @@ PHP_FUNCTION(apache_reset_timeout);
 
 PHP_MINFO_FUNCTION(apache);
 
-function_entry apache_functions[] = {
+zend_function_entry apache_functions[] = {
        PHP_FE(virtual,                                                                 NULL)
        PHP_FE(apache_request_headers,                                  NULL)
        PHP_FE(apache_note,                                                             NULL)

diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c
index a8191d0fbdd1d9525e0694c279788fadd6ba1c3e..4a2d81b1a69e832ed4960a25455227fc2184be6f 100644 (file)
--- a/sapi/apache2filter/php_functions.c
+++ b/sapi/apache2filter/php_functions.c
@@ -355,7 +355,7 @@ PHP_MINFO_FUNCTION(apache)
        php_info_print_table_end();
 }
 
-static function_entry apache_functions[] = {
+static zend_function_entry apache_functions[] = {
        PHP_FE(apache_lookup_uri, NULL)
        PHP_FE(virtual, NULL)
        PHP_FE(apache_request_headers, NULL)

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 302c7b7e77ee22f63cc59c8f1a042948500981e2..7c286c605e1db7c9b64d2aa5f91b91eebabab94c 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -462,7 +462,7 @@ PHP_MINFO_FUNCTION(apache)
        }
 }
 
-static function_entry apache_functions[] = {
+static zend_function_entry apache_functions[] = {
        PHP_FE(apache_lookup_uri, NULL)
        PHP_FE(virtual, NULL) 
        PHP_FE(apache_request_headers, NULL)

diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index 590707d4cc1241f404d9aaf19d4c9f93a9c354e1..eebea94b604500f4cfcca31d80bb230e4967897b 100644 (file)
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -60,7 +60,7 @@ PHP_FUNCTION(apache_get_modules);
 PHP_MINFO_FUNCTION(apache);
 
 
-function_entry apache_functions[] = {
+zend_function_entry apache_functions[] = {
        PHP_FE(virtual,                                                                 NULL)
        PHP_FE(apache_request_headers,                                  NULL)
        PHP_FE(apache_note,                                                             NULL)
@@ -1286,7 +1286,7 @@ PHP_FUNCTION(apache_request_send_header_field)
 
 /* {{{ php_apache_request_class_functions
  */
-static function_entry php_apache_request_class_functions[] = {
+static zend_function_entry php_apache_request_class_functions[] = {
        /* string slots */
        PHP_FALIAS(args,                                                apache_request_args,                            NULL)
        PHP_FALIAS(boundary,                                    apache_request_boundary,                        NULL)

diff --git a/sapi/continuity/capi.c b/sapi/continuity/capi.c
index fb52acf3e61207d9501c16cab46699a692f5d405..4053292bebd60088a8ebcfbac101d3c05e70f423 100644 (file)
--- a/sapi/continuity/capi.c
+++ b/sapi/continuity/capi.c
@@ -80,7 +80,7 @@ PHP_FUNCTION(continuity_virtual);
 PHP_FUNCTION(continuity_request_headers);
 PHP_FUNCTION(continuity_response_headers);
 
-function_entry continuity_functions[] = {
+zend_function_entry continuity_functions[] = {
         {NULL, NULL, NULL}
 };
 

diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index a0fad53d8f6408f40a6296c745442e41e22d69f7..f9e18bbcb9cfebc28894c54965a79a5663c968a1 100644 (file)
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -748,7 +748,7 @@ PHP_MINFO_FUNCTION(milter)
 
 /* {{{ milter_functions[]
 */
-static function_entry milter_functions[] = {
+static zend_function_entry milter_functions[] = {
        PHP_FE(smfi_setflags, NULL)
        PHP_FE(smfi_settimeout, NULL)
        PHP_FE(smfi_getsymval, NULL)

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 21e6ca70204104ed76f8473262c4d7b2843cb7d2..69eccdd15d25b0ba1ef11bb7e368b1ba98c4fc4d 100644 (file)
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -174,7 +174,7 @@ ZEND_DECLARE_MODULE_GLOBALS(nsapi)
  *
  * Every user visible function must have an entry in nsapi_functions[].
  */
-function_entry nsapi_functions[] = {
+zend_function_entry nsapi_functions[] = {
        PHP_FE(nsapi_virtual,   NULL)                                                                           /* Make subrequest */
        PHP_FALIAS(virtual, nsapi_virtual, NULL)                                                        /* compatibility */
        PHP_FE(nsapi_request_headers, NULL)                                                                     /* get request headers */