cvs: /php4/ext/msql php_msql.c

zeev Fri Sep 24 10:09:35 1999 EDT Modified files: /php4/ext/msql php_msql.c Log: This should make the mSQL module compile again (untested) Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.3 php4/ext/msql/php_msql.c:1.4 --- php4/ext/msql/php_msql.c:1.3 Sat Sep 4 09:18:55 1999 +++ php4/ext/msql/php_msql.c Fri Sep 24 10:09:35 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.3 1999/09/04 13:18:55 zeev Exp $ */ +/* $Id: php_msql.c,v 1.4 1999/09/24 14:09:35 zeev Exp $ */ #include "php.h" #if COMPILE_DL @@ -116,7 +116,7 @@ } m_query; #define MSQL_GET_QUERY(res) \ - ZEND_FETCH_RESOURCE(msql_query, m_query *, res, -1, "mSQL result", msql_globals.le_query); \ + ZEND_FETCH_RESOURCE(msql_query, m_query *, &res, -1, "mSQL result", msql_globals.le_query); \ msql_result = msql_query->result static void _delete_query(void *arg) @@ -402,7 +402,7 @@ break; } - msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); + msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); ZEND_VERIFY_RESOURCE(msql); zend_list_delete(id); @@ -438,7 +438,7 @@ } - msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); + msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); ZEND_VERIFY_RESOURCE(msql); convert_to_string(db); @@ -478,7 +478,7 @@ break; } - msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); + msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); ZEND_VERIFY_RESOURCE(msql); convert_to_string(db); @@ -517,7 +517,7 @@ break; } - msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); + msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); ZEND_VERIFY_RESOURCE(msql); convert_to_string(db); @@ -557,7 +557,7 @@ break; } - msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); + msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); ZEND_VERIFY_RESOURCE(msql); convert_to_string(query); @@ -596,7 +596,7 @@ break; } - msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); + msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); ZEND_VERIFY_RESOURCE(msql); convert_to_string(db); @@ -637,7 +637,7 @@ break; } - msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); + msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); ZEND_VERIFY_RESOURCE(msql); if ((msql_result=msqlListDBs(msql))==NULL) { @@ -676,7 +676,7 @@ break; } - msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); + msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); ZEND_VERIFY_RESOURCE(msql); convert_to_string(db); @@ -719,7 +719,7 @@ break; } - msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); + msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); ZEND_VERIFY_RESOURCE(msql); convert_to_string(db);