com php/gtk-src: use init class macros and ifdef out stuff touching default properties for now on 5.4: main/phpg_gobject.c main/phpg _support.c

Commit:    84e3370df4e9e56a1a2e9ec632679c42ad593349=0AAuthor:    Elizabeth =
M Smith <[email protected]>         Tue, 17 Jul 2012 11:20:47 -0400=
=0AParents:   e349ad95ec005767327b5936346574571d358d29=0ABranches:  master=
=0A=0ALink:       http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dcommitdiff;h=
=3D84e3370df4e9e56a1a2e9ec632679c42ad593349=0A=0ALog:=0Ause init class macr=
os and ifdef out stuff touching default properties for now on 5.4=0A=0AChan=
ged paths:=0A  M  main/phpg_gobject.c=0A  M  main/phpg_support.c=0A=0A=0ADi=
ff:=0Adiff --git a/main/phpg_gobject.c b/main/phpg_gobject.c=0Aindex 9727a5=
5..437f50e 100644=0A--- a/main/phpg_gobject.c=0A+++ b/main/phpg_gobject.c=
=0A@@ -1419,7 +1419,7 @@ static PHP_METHOD(GObject, register_type)=0A     z=
end_declare_class_constant_long(class, "gtype", sizeof("gtype")-1, new_type=
 TSRMLS_CC);=0A =0A     zend_update_class_constants(class TSRMLS_CC);=0A-=
=0A+#if PHP_VERSION_ID < 50399=0A     /* register properties */=0A     if (=
zend_hash_find(&class->default_properties, "__gproperties", sizeof("__gprop=
erties"), (void**)&prop_decls) =3D=3D SUCCESS) {=0A         if (Z_TYPE_PP(p=
rop_decls) !=3D IS_ARRAY) {=0A@@ -1455,7 +1455,7 @@ static PHP_METHOD(GObje=
ct, register_type)=0A         }=0A         zend_hash_del(&class->default_pr=
operties, "__gsignals", sizeof("__gsignals"));=0A     }=0A-    =0A+#endif=
=0A     if (free_name) {=0A         g_free(type_name);=0A     }=0Adiff --gi=
t a/main/phpg_support.c b/main/phpg_support.c=0Aindex 4eca9d6..cee6364 1006=
44=0A--- a/main/phpg_support.c=0A+++ b/main/phpg_support.c=0A@@ -271,7 +271=
,7 @@ PHP_GTK_API void phpg_init_object(void *object, zend_class_entry *ce =
TSRMLS_DC)=0A =0A =09poh->pi_hash =3D NULL;=0A =0A-#if PHP_VERSION_ID < 503=
99=09=0A+#if PHP_VERSION_ID < 50399=0A =09zend_hash_copy(poh->zobj.properti=
es, &(ce->default_properties),=0A =09              (copy_ctor_func_t)zval_a=
dd_ref, (void *)(&tmp),=0A =09               sizeof(zval *));=0A@@ -288,7 +=
288,7 @@ PHP_GTK_API void phpg_init_object(void *object, zend_class_entry *=
ce TSRMLS_DC)=0A =09=09prop_ce =3D prop_ce->parent;=0A =09}=0A =0A-    zend=
_hash_find(&phpg_prop_info, prop_ce->name, prop_ce->name_length+1, (void **=
) &poh->pi_hash);=0A+    //zend_hash_find(&phpg_prop_info, prop_ce->name, p=
rop_ce->name_length+1, (void **) &poh->pi_hash);=0A }=0A /* }}} */=0A =0A@@=
 -311,11 +311,7 @@ PHP_GTK_API zend_class_entry* phpg_register_class(const =
char *class_name,=0A =09=09phpg_class_key =3D g_quark_from_static_string(ph=
pg_class_id);=0A =09}=0A =0A-=09memset(&ce, 0, sizeof(ce));=0A-=0A-=09ce.na=
me =3D strdup(class_name);=0A-=09ce.name_length =3D strlen(class_name);=0A-=
=09ce.builtin_functions =3D class_methods;=0A+=09INIT_CLASS_ENTRY_EX(ce, st=
rdup(class_name), strlen(class_name), class_methods);=0A =0A =09real_ce =3D=
 zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC);=0A =0A@@ -36=
5,10 +361,7 @@ PHP_GTK_API zend_class_entry* phpg_register_interface(const =
char *iface_name,=0A =09=09phpg_class_key =3D g_quark_from_static_string(ph=
pg_class_id);=0A =09}=0A =0A-    memset(&ce, 0, sizeof(ce));=0A-    ce.name=
 =3D strdup(iface_name);=0A-    ce.name_length =3D strlen(iface_name);=0A- =
   ce.builtin_functions =3D iface_methods;=0A+=09INIT_CLASS_ENTRY_EX(ce, st=
rdup(iface_name), strlen(iface_name), iface_methods);=0A =0A     real_ce =
=3D zend_register_internal_interface(&ce TSRMLS_CC);=0A