Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > 41497efa3c6183899a13c5c392b27377 > files > 1

php-drizzle-0.4.2-9.mga3.src.rpm

--- php_drizzle.c~	1970-01-01 17:13:08.000000000 +0800
+++ php_drizzle.c	2013-01-14 01:10:27.468620883 +0800
@@ -1314,9 +1314,13 @@
 	}
 
 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
 	              (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
 	               sizeof(zval *));
+#else
+	object_properties_init(&(obj->std), class_type);
+#endif
 
 	value.handle= zend_objects_store_put(obj,
 	                   (zend_objects_store_dtor_t)zend_objects_destroy_object,
@@ -1582,10 +1586,13 @@
 	}
 
 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
 	               sizeof(zval *));
-
+#else
+	object_properties_init(&(obj->std), class_type);
+#endif
 	obj->value.handle= zend_objects_store_put(obj,
 	                  (zend_objects_store_dtor_t)zend_objects_destroy_object,
 	                  (zend_objects_free_object_storage_t)drizzle_con_obj_free,
@@ -2505,9 +2512,13 @@
 	}
 
 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
 	               sizeof(zval *));
+#else
+	object_properties_init(&(obj->std), class_type);
+#endif
 
 	obj->value.handle= zend_objects_store_put(obj,
 	               (zend_objects_store_dtor_t)zend_objects_destroy_object,
@@ -3017,10 +3028,13 @@
 	}
 
 	zend_object_std_init(&(result->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
 	zend_hash_copy(result->std.properties, &(class_type->default_properties),
 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
 	               sizeof(zval *));
-
+#else
+	object_properties_init(&(result->std), class_type);
+#endif
 	value.handle= zend_objects_store_put(result,
 	              (zend_objects_store_dtor_t)zend_objects_destroy_object,
 	              (zend_objects_free_object_storage_t)drizzle_result_obj_free,
@@ -3382,9 +3396,13 @@
 	}
 
 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
 	               sizeof(zval *));
+#else
+	object_properties_init(&(obj->std), class_type);
+#endif
 
 	value.handle= zend_objects_store_put(obj,
 	             (zend_objects_store_dtor_t)zend_objects_destroy_object,