cvs: php4 /ext/odbc php_odbc.c

andi Sat Jul 28 15:29:16 2001 EDT Modified files: /php4/ext/odbc php_odbc.c Log: - Object macros... Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.96 php4/ext/odbc/php_odbc.c:1.97 --- php4/ext/odbc/php_odbc.c:1.96 Sat Jul 28 07:36:04 2001 +++ php4/ext/odbc/php_odbc.c Sat Jul 28 15:29:16 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.96 2001/07/28 11:36:04 zeev Exp $ */ +/* $Id: php_odbc.c,v 1.97 2001/07/28 19:29:16 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1337,12 +1337,13 @@ Fetch a result row as an object */ PHP_FUNCTION(odbc_fetch_object) { - php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); - if (return_value->type==IS_ARRAY) { - return_value->type=IS_OBJECT; - return_value->value.obj.properties = return_value->value.ht; - return_value->value.obj.ce = &zend_standard_class_def; - } + /* OBJECTS_FIXME */ + php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); + if (Z_TYPE_P(return_value) == IS_ARRAY) { + Z_TYPE_P(return_value) = IS_OBJECT; + Z_OBJPROP_P(return_value) = return_value->value.ht; + Z_OBJCE_P(return_value) = &zend_standard_class_def; + } } /* }}} */ @@ -1350,7 +1351,7 @@ Fetch a result row as an associative array */ PHP_FUNCTION(odbc_fetch_array) { - php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); + php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); } /* }}} */ #endif