use init class macros and ifdef out stuff touching default properties for now on 5.4

auroraeosrose · auroraeosrose · commit 84e3370df4e9 · 2012-07-17T11:20:47.000-04:00
diff --git a/main/phpg_gobject.c b/main/phpg_gobject.c
@@ -1419,7 +1419,7 @@ static PHP_METHOD(GObject, register_type)
     zend_declare_class_constant_long(class, "gtype", sizeof("gtype")-1, new_type TSRMLS_CC);
 
     zend_update_class_constants(class TSRMLS_CC);
-
+#if PHP_VERSION_ID < 50399
     /* register properties */
     if (zend_hash_find(&class->default_properties, "__gproperties", sizeof("__gproperties"), (void**)&prop_decls) == SUCCESS) {
         if (Z_TYPE_PP(prop_decls) != IS_ARRAY) {
@@ -1455,7 +1455,7 @@ static PHP_METHOD(GObject, register_type)
         }
         zend_hash_del(&class->default_properties, "__gsignals", sizeof("__gsignals"));
     }
-    
+#endif
     if (free_name) {
         g_free(type_name);
     }
diff --git a/main/phpg_support.c b/main/phpg_support.c
@@ -271,7 +271,7 @@ PHP_GTK_API void phpg_init_object(void *object, zend_class_entry *ce TSRMLS_DC)
 
 	poh->pi_hash = NULL;
 
-#if PHP_VERSION_ID < 50399	
+#if PHP_VERSION_ID < 50399
 	zend_hash_copy(poh->zobj.properties, &(ce->default_properties),
 	              (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
 	               sizeof(zval *));
@@ -288,7 +288,7 @@ PHP_GTK_API void phpg_init_object(void *object, zend_class_entry *ce TSRMLS_DC)
 		prop_ce = prop_ce->parent;
 	}
 
-    zend_hash_find(&phpg_prop_info, prop_ce->name, prop_ce->name_length+1, (void **) &poh->pi_hash);
+    //zend_hash_find(&phpg_prop_info, prop_ce->name, prop_ce->name_length+1, (void **) &poh->pi_hash);
 }
 /* }}} */
 
@@ -311,11 +311,7 @@ PHP_GTK_API zend_class_entry* phpg_register_class(const char *class_name,
 		phpg_class_key = g_quark_from_static_string(phpg_class_id);
 	}
 
-	memset(&ce, 0, sizeof(ce));
-
-	ce.name = strdup(class_name);
-	ce.name_length = strlen(class_name);
-	ce.builtin_functions = class_methods;
+	INIT_CLASS_ENTRY_EX(ce, strdup(class_name), strlen(class_name), class_methods);
 
 	real_ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC);
 
@@ -365,10 +361,7 @@ PHP_GTK_API zend_class_entry* phpg_register_interface(const char *iface_name,
 		phpg_class_key = g_quark_from_static_string(phpg_class_id);
 	}
 
-    memset(&ce, 0, sizeof(ce));
-    ce.name = strdup(iface_name);
-    ce.name_length = strlen(iface_name);
-    ce.builtin_functions = iface_methods;
+	INIT_CLASS_ENTRY_EX(ce, strdup(iface_name), strlen(iface_name), iface_methods);
 
     real_ce = zend_register_internal_interface(&ce TSRMLS_CC);
 

Original file line number	Diff line number	Diff line change
`@@ -1419,7 +1419,7 @@ static PHP_METHOD(GObject, register_type)`
`1419`	`1419`	`zend_declare_class_constant_long(class, "gtype", sizeof("gtype")-1, new_type TSRMLS_CC);`
`1420`	`1420`
`1421`	`1421`	`zend_update_class_constants(class TSRMLS_CC);`
`1422`		`-`
	`1422`	`+#if PHP_VERSION_ID < 50399`
`1423`	`1423`	`/* register properties */`
`1424`	`1424`	`if (zend_hash_find(&class->default_properties, "__gproperties", sizeof("__gproperties"), (void**)&prop_decls) == SUCCESS) {`
`1425`	`1425`	`if (Z_TYPE_PP(prop_decls) != IS_ARRAY) {`
`@@ -1455,7 +1455,7 @@ static PHP_METHOD(GObject, register_type)`
`1455`	`1455`	`}`
`1456`	`1456`	`zend_hash_del(&class->default_properties, "__gsignals", sizeof("__gsignals"));`
`1457`	`1457`	`}`
`1458`		`-`
	`1458`	`+#endif`
`1459`	`1459`	`if (free_name) {`
`1460`	`1460`	`g_free(type_name);`
`1461`	`1461`	`}`