cvs: php4 /ext/fbsql php_fbsql.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/mysql php_mysql.c /ext/odbc php_odbc.c /ext/pgsql pgsql.c
/ext/standard browscap.c var_unserializer.c var_unserializer.re /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c
| From: | Andi Gutmans | Date: | Tue, 12 Mar 2002 20:18:09 +0000 |
| Subject: | cvs: php4 /ext/fbsql php_fbsql.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/mysql php_mysql.c /ext/odbc php_odbc.c /ext/pgsql pgsql.c /ext/standard browscap.c var_unserializer.c var_unserializer.re /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10042@lists.php.net to get a copy of this message | ||
andi Tue Mar 12 15:18:09 2002 EDT
Modified files:
/php4/ext/fbsql php_fbsql.c
/php4/ext/msql php_msql.c
/php4/ext/mssql php_mssql.c
/php4/ext/mysql php_mysql.c
/php4/ext/odbc php_odbc.c
/php4/ext/pgsql pgsql.c
/php4/ext/standard browscap.c var_unserializer.c
var_unserializer.re
/php4/ext/sybase php_sybase_db.c
/php4/ext/sybase_ct php_sybase_ct.c
Log:
- Allow duality between Engine 1 & 2 using ZEND_STANDARD_CLASS_DEF_PTR
Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.76 php4/ext/fbsql/php_fbsql.c:1.77 --- php4/ext/fbsql/php_fbsql.c:1.76 Thu Feb 28 03:26:06 2002 +++ php4/ext/fbsql/php_fbsql.c Tue Mar 12 15:17:47 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.76 2002/02/28 08:26:06 sebastian Exp $ */ +/* $Id: php_fbsql.c,v 1.77 2002/03/12 20:17:47 andi Exp $ */ /* TODO: * @@ -2687,7 +2687,7 @@ { php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.47 php4/ext/msql/php_msql.c:1.48 --- php4/ext/msql/php_msql.c:1.47 Thu Feb 28 03:26:24 2002 +++ php4/ext/msql/php_msql.c Tue Mar 12 15:17:48 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.47 2002/02/28 08:26:24 sebastian Exp $ */ +/* $Id: php_msql.c,v 1.48 2002/03/12 20:17:48 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -982,7 +982,7 @@ { php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.78 php4/ext/mssql/php_mssql.c:1.79 --- php4/ext/mssql/php_mssql.c:1.78 Thu Feb 28 03:26:25 2002 +++ php4/ext/mssql/php_mssql.c Tue Mar 12 15:17:49 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.78 2002/02/28 08:26:25 sebastian Exp $ */ +/* $Id: php_mssql.c,v 1.79 2002/03/12 20:17:49 andi Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -1271,7 +1271,7 @@ { php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.116 php4/ext/mysql/php_mysql.c:1.117 --- php4/ext/mysql/php_mysql.c:1.116 Thu Feb 28 03:26:25 2002 +++ php4/ext/mysql/php_mysql.c Tue Mar 12 15:17:51 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.116 2002/02/28 08:26:25 sebastian Exp $ */ +/* $Id: php_mysql.c,v 1.117 2002/03/12 20:17:51 andi Exp $ */ /* TODO: @@ -1661,7 +1661,7 @@ php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 2); if (Z_TYPE_P(return_value) == IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.120 php4/ext/odbc/php_odbc.c:1.121 --- php4/ext/odbc/php_odbc.c:1.120 Tue Mar 5 11:45:02 2002 +++ php4/ext/odbc/php_odbc.c Tue Mar 12 15:17:53 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.120 2002/03/05 16:45:02 kalowsky Exp $ */ +/* $Id: php_odbc.c,v 1.121 2002/03/12 20:17:53 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1365,7 +1365,7 @@ { php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); if (Z_TYPE_P(return_value) == IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.154 php4/ext/pgsql/pgsql.c:1.155 --- php4/ext/pgsql/pgsql.c:1.154 Mon Mar 11 09:53:59 2002 +++ php4/ext/pgsql/pgsql.c Tue Mar 12 15:17:54 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.154 2002/03/11 14:53:59 yohgaki Exp $ */ +/* $Id: pgsql.c,v 1.155 2002/03/12 20:17:54 andi Exp $ */ #include <stdlib.h> @@ -1288,7 +1288,7 @@ { php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.55 php4/ext/standard/browscap.c:1.56 --- php4/ext/standard/browscap.c:1.55 Thu Feb 28 03:26:44 2002 +++ php4/ext/standard/browscap.c Tue Mar 12 15:17:56 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.55 2002/02/28 08:26:44 sebastian Exp $ */ +/* $Id: browscap.c,v 1.56 2002/03/12 20:17:56 andi Exp $ */ #include "php.h" #include "php_regex.h" @@ -116,7 +116,7 @@ INIT_PZVAL(processed); /* OBJECTS_FIXME */ - Z_OBJCE_P(current_section) = &zend_standard_class_def; + Z_OBJCE_P(current_section) = ZEND_STANDARD_CLASS_DEF_PTR; Z_OBJPROP_P(current_section) = (HashTable *) malloc(sizeof(HashTable)); Z_TYPE_P(current_section) = IS_OBJECT; zend_hash_init(Z_OBJPROP_P(current_section), 0, NULL, (dtor_func_t) browscap_entry_dtor, 1); Index: php4/ext/standard/var_unserializer.c diff -u php4/ext/standard/var_unserializer.c:1.8 php4/ext/standard/var_unserializer.c:1.9 --- php4/ext/standard/var_unserializer.c:1.8 Thu Mar 7 10:51:29 2002 +++ php4/ext/standard/var_unserializer.c Tue Mar 12 15:17:56 2002 @@ -458,7 +458,7 @@ INIT_PZVAL(*rval); return object_common2(UNSERIALIZE_PASSTHRU, - object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def)); + object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } yy28: yych = *++YYCURSOR; if(yych <= ','){ Index: php4/ext/standard/var_unserializer.re diff -u php4/ext/standard/var_unserializer.re:1.4 php4/ext/standard/var_unserializer.re:1.5 --- php4/ext/standard/var_unserializer.re:1.4 Sun Dec 2 12:31:11 2001 +++ php4/ext/standard/var_unserializer.re Tue Mar 12 15:17:57 2002 @@ -323,7 +323,7 @@ INIT_PZVAL(*rval); return object_common2(UNSERIALIZE_PASSTHRU, - object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def)); + object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } "O:" iv ":" ["] { Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.36 php4/ext/sybase/php_sybase_db.c:1.37 --- php4/ext/sybase/php_sybase_db.c:1.36 Wed Mar 6 10:59:42 2002 +++ php4/ext/sybase/php_sybase_db.c Tue Mar 12 15:18:00 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.36 2002/03/06 15:59:42 derick Exp $ */ +/* $Id: php_sybase_db.c,v 1.37 2002/03/12 20:18:00 andi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1074,7 +1074,7 @@ if (Z_TYPE_P(return_value)==IS_ARRAY) { Z_TYPE_P(return_value)=IS_OBJECT; Z_OBJPROP_P(return_value) = Z_ARRVAL_P(return_value); - Z_OBJCE_P(return_value) = &zend_standard_class_def; + Z_OBJCE_P(return_value) = ZEND_STANDARD_CLASS_DEF_PTR; } } /* }}} */ Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.69 php4/ext/sybase_ct/php_sybase_ct.c:1.70 --- php4/ext/sybase_ct/php_sybase_ct.c:1.69 Wed Mar 6 10:59:44 2002 +++ php4/ext/sybase_ct/php_sybase_ct.c Tue Mar 12 15:18:01 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.69 2002/03/06 15:59:44 derick Exp $ */ +/* $Id: php_sybase_ct.c,v 1.70 2002/03/12 20:18:01 andi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1411,7 +1411,7 @@ { php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */
Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.76 php4/ext/fbsql/php_fbsql.c:1.77 --- php4/ext/fbsql/php_fbsql.c:1.76 Thu Feb 28 03:26:06 2002 +++ php4/ext/fbsql/php_fbsql.c Tue Mar 12 15:17:47 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.76 2002/02/28 08:26:06 sebastian Exp $ */ +/* $Id: php_fbsql.c,v 1.77 2002/03/12 20:17:47 andi Exp $ */ /* TODO: * @@ -2687,7 +2687,7 @@ { php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.47 php4/ext/msql/php_msql.c:1.48 --- php4/ext/msql/php_msql.c:1.47 Thu Feb 28 03:26:24 2002 +++ php4/ext/msql/php_msql.c Tue Mar 12 15:17:48 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.47 2002/02/28 08:26:24 sebastian Exp $ */ +/* $Id: php_msql.c,v 1.48 2002/03/12 20:17:48 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -982,7 +982,7 @@ { php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.78 php4/ext/mssql/php_mssql.c:1.79 --- php4/ext/mssql/php_mssql.c:1.78 Thu Feb 28 03:26:25 2002 +++ php4/ext/mssql/php_mssql.c Tue Mar 12 15:17:49 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.78 2002/02/28 08:26:25 sebastian Exp $ */ +/* $Id: php_mssql.c,v 1.79 2002/03/12 20:17:49 andi Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -1271,7 +1271,7 @@ { php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.116 php4/ext/mysql/php_mysql.c:1.117 --- php4/ext/mysql/php_mysql.c:1.116 Thu Feb 28 03:26:25 2002 +++ php4/ext/mysql/php_mysql.c Tue Mar 12 15:17:51 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.116 2002/02/28 08:26:25 sebastian Exp $ */ +/* $Id: php_mysql.c,v 1.117 2002/03/12 20:17:51 andi Exp $ */ /* TODO: @@ -1661,7 +1661,7 @@ php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 2); if (Z_TYPE_P(return_value) == IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.120 php4/ext/odbc/php_odbc.c:1.121 --- php4/ext/odbc/php_odbc.c:1.120 Tue Mar 5 11:45:02 2002 +++ php4/ext/odbc/php_odbc.c Tue Mar 12 15:17:53 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.120 2002/03/05 16:45:02 kalowsky Exp $ */ +/* $Id: php_odbc.c,v 1.121 2002/03/12 20:17:53 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1365,7 +1365,7 @@ { php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); if (Z_TYPE_P(return_value) == IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.154 php4/ext/pgsql/pgsql.c:1.155 --- php4/ext/pgsql/pgsql.c:1.154 Mon Mar 11 09:53:59 2002 +++ php4/ext/pgsql/pgsql.c Tue Mar 12 15:17:54 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.154 2002/03/11 14:53:59 yohgaki Exp $ */ +/* $Id: pgsql.c,v 1.155 2002/03/12 20:17:54 andi Exp $ */ #include <stdlib.h> @@ -1288,7 +1288,7 @@ { php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */ Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.55 php4/ext/standard/browscap.c:1.56 --- php4/ext/standard/browscap.c:1.55 Thu Feb 28 03:26:44 2002 +++ php4/ext/standard/browscap.c Tue Mar 12 15:17:56 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.55 2002/02/28 08:26:44 sebastian Exp $ */ +/* $Id: browscap.c,v 1.56 2002/03/12 20:17:56 andi Exp $ */ #include "php.h" #include "php_regex.h" @@ -116,7 +116,7 @@ INIT_PZVAL(processed); /* OBJECTS_FIXME */ - Z_OBJCE_P(current_section) = &zend_standard_class_def; + Z_OBJCE_P(current_section) = ZEND_STANDARD_CLASS_DEF_PTR; Z_OBJPROP_P(current_section) = (HashTable *) malloc(sizeof(HashTable)); Z_TYPE_P(current_section) = IS_OBJECT; zend_hash_init(Z_OBJPROP_P(current_section), 0, NULL, (dtor_func_t) browscap_entry_dtor, 1); Index: php4/ext/standard/var_unserializer.c diff -u php4/ext/standard/var_unserializer.c:1.8 php4/ext/standard/var_unserializer.c:1.9 --- php4/ext/standard/var_unserializer.c:1.8 Thu Mar 7 10:51:29 2002 +++ php4/ext/standard/var_unserializer.c Tue Mar 12 15:17:56 2002 @@ -458,7 +458,7 @@ INIT_PZVAL(*rval); return object_common2(UNSERIALIZE_PASSTHRU, - object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def)); + object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } yy28: yych = *++YYCURSOR; if(yych <= ','){ Index: php4/ext/standard/var_unserializer.re diff -u php4/ext/standard/var_unserializer.re:1.4 php4/ext/standard/var_unserializer.re:1.5 --- php4/ext/standard/var_unserializer.re:1.4 Sun Dec 2 12:31:11 2001 +++ php4/ext/standard/var_unserializer.re Tue Mar 12 15:17:57 2002 @@ -323,7 +323,7 @@ INIT_PZVAL(*rval); return object_common2(UNSERIALIZE_PASSTHRU, - object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def)); + object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } "O:" iv ":" ["] { Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.36 php4/ext/sybase/php_sybase_db.c:1.37 --- php4/ext/sybase/php_sybase_db.c:1.36 Wed Mar 6 10:59:42 2002 +++ php4/ext/sybase/php_sybase_db.c Tue Mar 12 15:18:00 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.36 2002/03/06 15:59:42 derick Exp $ */ +/* $Id: php_sybase_db.c,v 1.37 2002/03/12 20:18:00 andi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1074,7 +1074,7 @@ if (Z_TYPE_P(return_value)==IS_ARRAY) { Z_TYPE_P(return_value)=IS_OBJECT; Z_OBJPROP_P(return_value) = Z_ARRVAL_P(return_value); - Z_OBJCE_P(return_value) = &zend_standard_class_def; + Z_OBJCE_P(return_value) = ZEND_STANDARD_CLASS_DEF_PTR; } } /* }}} */ Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.69 php4/ext/sybase_ct/php_sybase_ct.c:1.70 --- php4/ext/sybase_ct/php_sybase_ct.c:1.69 Wed Mar 6 10:59:44 2002 +++ php4/ext/sybase_ct/php_sybase_ct.c Tue Mar 12 15:18:01 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.69 2002/03/06 15:59:44 derick Exp $ */ +/* $Id: php_sybase_ct.c,v 1.70 2002/03/12 20:18:01 andi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1411,7 +1411,7 @@ { php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); if (Z_TYPE_P(return_value)==IS_ARRAY) { - object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value)); + object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value)); } } /* }}} */