- Allow duality between Engine 1 & 2 using ZEND_STANDARD_CLASS_DEF_PTR

diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index 41147a19ec0a41e84565fc5f86fd1be0a96d7abf..6b0a4c5693c9d7cf860e1bcc4bdc73c02c42c04e 100644 (file)
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -2687,7 +2687,7 @@ PHP_FUNCTION(fbsql_fetch_object)
 {
        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));
        }
 }
 /* }}} */

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 4c2d2e8de1da91edd2612b62f37a55fe9006c81f..c253afdcaae9892f6dcc31f622c9408ba4490245 100644 (file)
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -982,7 +982,7 @@ PHP_FUNCTION(msql_fetch_object)
 {
        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));
        }
 }
 /* }}} */

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index f20b5f94c0ac2c20b4ac50c79c8734d92af8c055..44fb7cd7249c5f895c206217b97b2679d39d16cb 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -1271,7 +1271,7 @@ PHP_FUNCTION(mssql_fetch_object)
 {
        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));
        }
 }
 

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index eb3a96ebdd1f10e5b0b702797f5bf75cc07fac9c..c859beaece529cabf552648c90cbd614876280e1 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1661,7 +1661,7 @@ PHP_FUNCTION(mysql_fetch_object)
        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));
        }
 }
 /* }}} */

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 36c950dfcd46b7ad3309169b715eba16b77b45b8..faa4f362efdffb85f8cae23a401c5f872fc6ff02 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1365,7 +1365,7 @@ PHP_FUNCTION(odbc_fetch_object)
 {
        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));
        }
 }
 /* }}} */

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index bc0dca5aa14dfc151efc7dcbf41067b609d4bfdc..fa96dd254cf8cdbbc2dcc2d3a18878df13773207 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1288,7 +1288,7 @@ PHP_FUNCTION(pg_fetch_object)
 {
        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));
        }
 }
 /* }}} */

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index dbef99ecc118a1a0c1811ccd5d9bf980f5106a73..8a13ebacaa45a701dd31bee74e38145f659a0c5c 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -116,7 +116,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type, vo
                                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);

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 68ae3938d0ed17d62a8823fdcac5461dfbe3e942..7518f8c30370e29b164f31b168d9d86733664565 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -458,7 +458,7 @@ yy27:
        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 <= ','){

diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 8820baa1137dcf7179b23445c17adc4cf3d88679..24f587ac79c40dd405b8653009a83afca6e18131 100644 (file)
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -323,7 +323,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
        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 ":" ["]        {

diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 182351572b54f89375906a39dc4aedab1edb305e..93ab6e3dffb22bd04f74847391ea7d7ee5459d55 100644 (file)
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -1074,7 +1074,7 @@ PHP_FUNCTION(sybase_fetch_object)
        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;
        }
 }
 /* }}} */

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 8c1ad93ac332ef0e892d4c733ff6cf7c46136177..75f5d3f28f3cffd3cdb61bb09935ae5c85050b4f 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -1411,7 +1411,7 @@ PHP_FUNCTION(sybase_fetch_object)
 {
        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));
        }
 }
 /* }}} */