MFH

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 0e83fb8fe2d363e2a05a041cc55e710ad3ee9ab6..327d6d1b68f4d2f40a41a5a96950cac6068e5b91 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -47,7 +47,7 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int
 
 static void _mssql_bind_hash_dtor(void *data);
 
-function_entry mssql_functions[] = {
+zval_function_entry mssql_functions[] = {
        PHP_FE(mssql_connect,                           NULL)
        PHP_FE(mssql_pconnect,                          NULL)
        PHP_FE(mssql_close,                                     NULL)

diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h
index b2ead409b88d57a4c9fc533fc1009bc8ab3872ff..17e5d4d10e5ead89944cbbc1754f6d93782b1917 100644 (file)
--- a/ext/mssql/php_mssql.h
+++ b/ext/mssql/php_mssql.h
@@ -162,7 +162,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mssql)
        long cfg_min_error_severity, cfg_min_message_severity;
        long connect_timeout, timeout;
        zend_bool compatability_mode;
-       void (*get_column_content)(mssql_link *mssql_ptr,int offset,pval *result,int column_type  TSRMLS_DC);
+       void (*get_column_content)(mssql_link *mssql_ptr,int offset,zval *result,int column_type  TSRMLS_DC);
        long textsize, textlimit, batchsize;
        zend_bool datetimeconvert;
        HashTable *resource_list, *resource_plist;
@@ -180,7 +180,7 @@ typedef struct mssql_field {
 } mssql_field;
 
 typedef struct mssql_result {
-       pval **data;
+       zval **data;
        mssql_field *fields;
        mssql_link *mssql_ptr;
        mssql_statement * statement;