Various corrections.

diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index ef8b5e3d0fa87cea343bb301a4d9effafbf9da1c..e8e1026185ccb335681eeb5595f0ef6d5f23555d 100644 (file)
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -770,7 +770,7 @@ static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,pva
    Send Sybase query */
 PHP_FUNCTION(sybase_query)
 {
-       pval *query,*sybase_link_index;
+       zval **query, **sybase_link_index;
        int id,type,retvalue;
        sybase_link *sybase_ptr;
        sybase_result *result;

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 83fe5fbd2da77d7551e109bcf374396257c2c16f..3e57f3c6133e690b24890d56c0050ee23f3ad908 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -798,10 +798,10 @@ PHP_FUNCTION(sybase_close)
                        break;
        }
 
-       ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id, "Sybase-Link", le_link, le_plink);
+       ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, sybase_link_index, id, "Sybase-Link", le_link, le_plink);
 
        if (id == -1) { /* explicit resource number */
-               zend_list_delete(Z_RESVAL_P(sybase_link_index));
+               zend_list_delete(Z_RESVAL_PP(sybase_link_index));
        }
 
        if (id != -1 || (sybase_link_index && Z_RESVAL_PP(sybase_link_index)==SybCtG(default_link))) {
@@ -1721,7 +1721,7 @@ PHP_FUNCTION(sybase_data_seek)
        }
 
 
-       ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
+       ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", le_result);
 
        convert_to_long_ex(offset);
 
@@ -1788,7 +1788,7 @@ static char *php_sybase_get_field_name(CS_INT type)
    Get field information */
 PHP_FUNCTION(sybase_fetch_field)
 {
-       zval *sybase_result_index, *offset;
+       zval **sybase_result_index, **offset;
        int field_offset;
        sybase_result *result;
 
@@ -1811,7 +1811,7 @@ PHP_FUNCTION(sybase_fetch_field)
                        break;
        }
 
-       ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
+       ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", le_result);
 
        if (field_offset==-1) {
                field_offset = result->cur_field;
@@ -1849,7 +1849,7 @@ PHP_FUNCTION(sybase_field_seek)
                WRONG_PARAM_COUNT;
        }
 
-       ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
+       ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", le_result);
 
        convert_to_long_ex(offset);
        field_offset = Z_LVAL_PP(offset);
@@ -1883,7 +1883,7 @@ PHP_FUNCTION(sybase_result)
        }
 
 
-       ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", le_result);
+       ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", le_result);
 
        convert_to_long_ex(row);
        
@@ -1952,7 +1952,7 @@ PHP_FUNCTION(sybase_affected_rows)
                        break;
        }
 
-       ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id, "Sybase-Link", le_link, le_plink);
+       ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, sybase_link_index, id, "Sybase-Link", le_link, le_plink);
 
        Z_LVAL_P(return_value) = sybase_ptr->affected_rows;
        Z_TYPE_P(return_value) = IS_LONG;