cvs: php-gtk /main php_gtk.h phpg_gobject.c phpg_paramspec.c /win32 config.w32.in

auroraeosrose Wed Sep 19 13:38:47 2007 UTC Modified files: /php-gtk/main php_gtk.h phpg_gobject.c phpg_paramspec.c /php-gtk/win32 config.w32.in Log: Fixes for TSRM stuff for windows build - the 2.10 in overrides needs to be quoted or it's seen as 2.1 and version_compare loses its mind http://cvs.php.net/viewvc.cgi/php-gtk/main/php_gtk.h?r1=1.148&r2=1.149&diff_format=u Index: php-gtk/main/php_gtk.h diff -u php-gtk/main/php_gtk.h:1.148 php-gtk/main/php_gtk.h:1.149 --- php-gtk/main/php_gtk.h:1.148 Sun Sep 16 21:55:18 2007 +++ php-gtk/main/php_gtk.h Wed Sep 19 13:38:46 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.h,v 1.148 2007/09/16 21:55:18 andrei Exp $: */ +/* $Id: php_gtk.h,v 1.149 2007/09/19 13:38:46 auroraeosrose Exp $: */ #ifndef _PHP_GTK_H #define _PHP_GTK_H @@ -504,6 +504,7 @@ PHP_GTK_API GdkAtom phpg_gdkatom_from_zval(zval *value TSRMLS_DC); /* GParamSpec */ +void phpg_paramspec_register_self(TSRMLS_D); PHP_GTK_API void phpg_paramspec_new(zval **zobj, GParamSpec *pspec TSRMLS_DC); static inline phpg_paramspec_t* phpg_gparamspec_get(zval *zobj TSRMLS_DC) { http://cvs.php.net/viewvc.cgi/php-gtk/main/phpg_gobject.c?r1=1.62&r2=1.63&diff_format=u Index: php-gtk/main/phpg_gobject.c diff -u php-gtk/main/phpg_gobject.c:1.62 php-gtk/main/phpg_gobject.c:1.63 --- php-gtk/main/phpg_gobject.c:1.62 Sun Sep 16 21:55:18 2007 +++ php-gtk/main/phpg_gobject.c Wed Sep 19 13:38:47 2007 @@ -935,6 +935,7 @@ zval *php_pspec = NULL; zval *retval = NULL; + TSRMLS_FETCH(); phpg_gobject_new(&php_object, object TSRMLS_CC); phpg_paramspec_new(&php_pspec, pspec TSRMLS_CC); @@ -960,6 +961,7 @@ zval *php_value = NULL; zval *retval = NULL; + TSRMLS_FETCH(); if (phpg_gvalue_to_zval(value, &php_value, TRUE, TRUE TSRMLS_CC) == FAILURE) { php_error(E_WARNING, "phpg_object_set_property: could not convert GValue to PHP value"); zval_ptr_dtor(&php_value); @@ -988,6 +990,7 @@ static GParamSpec* phpg_create_property(const char *prop_name, GType prop_type, const char *nick, const char *blurb, zval *type_args, GParamFlags flags) { GParamSpec *pspec = NULL; + TSRMLS_FETCH(); switch (G_TYPE_FUNDAMENTAL(prop_type)) { case G_TYPE_CHAR: @@ -1164,6 +1167,8 @@ zval *type_args = NULL; zval *php_prop_type; + TSRMLS_FETCH(); + oclass = g_type_class_ref(type); if (!oclass) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "couuld not get a reference to type class"); @@ -1258,7 +1263,7 @@ return; } - parent_type = phpg_gtype_from_class(class); + parent_type = phpg_gtype_from_class(class TSRMLS_CC); if (!parent_type) { return; } @@ -1285,7 +1290,7 @@ } g_type_set_qdata(new_type, phpg_class_key, class); - zend_declare_class_constant_long(class, "gtype", sizeof("gtype")-1, new_type); + zend_declare_class_constant_long(class, "gtype", sizeof("gtype")-1, new_type TSRMLS_CC); zend_update_class_constants(class TSRMLS_CC); @@ -1295,7 +1300,7 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "__gproperties variable has to be an array"); return; } - if (phpg_register_properties(new_type, *prop_decls TSRMLS_CC) == FAILURE) { + if (phpg_register_properties(new_type, *prop_decls) == FAILURE) { return; } zend_hash_del(&class->default_properties, "__gproperties", sizeof("__gproperties")); http://cvs.php.net/viewvc.cgi/php-gtk/main/phpg_paramspec.c?r1=1.1&r2=1.2&diff_format=u Index: php-gtk/main/phpg_paramspec.c diff -u php-gtk/main/phpg_paramspec.c:1.1 php-gtk/main/phpg_paramspec.c:1.2 --- php-gtk/main/phpg_paramspec.c:1.1 Sun Sep 16 21:55:18 2007 +++ php-gtk/main/phpg_paramspec.c Wed Sep 19 13:38:47 2007 @@ -103,7 +103,7 @@ /* {{{ GParamSpec properties */ PHPG_PROP_READER(GParamSpec, gtype) { - phpg_gtype_new(return_value, G_PARAM_SPEC_TYPE(((phpg_paramspec_t *)object)->pspec)); + phpg_gtype_new(return_value, G_PARAM_SPEC_TYPE(((phpg_paramspec_t *)object)->pspec) TSRMLS_CC); return SUCCESS; } @@ -148,13 +148,13 @@ PHPG_PROP_READER(GParamSpec, owner_type) { - phpg_gtype_new(return_value, ((phpg_paramspec_t *)object)->pspec->owner_type); + phpg_gtype_new(return_value, ((phpg_paramspec_t *)object)->pspec->owner_type TSRMLS_CC); return SUCCESS; } PHPG_PROP_READER(GParamSpec, value_type) { - phpg_gtype_new(return_value, ((phpg_paramspec_t *)object)->pspec->value_type); + phpg_gtype_new(return_value, ((phpg_paramspec_t *)object)->pspec->value_type TSRMLS_CC); return SUCCESS; } http://cvs.php.net/viewvc.cgi/php-gtk/win32/config.w32.in?r1=1.16&r2=1.17&diff_format=u Index: php-gtk/win32/config.w32.in diff -u php-gtk/win32/config.w32.in:1.16 php-gtk/win32/config.w32.in:1.17 --- php-gtk/win32/config.w32.in:1.16 Tue May 29 12:40:22 2007 +++ php-gtk/win32/config.w32.in Wed Sep 19 13:38:47 2007 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32.in,v 1.16 2007/05/29 12:40:22 auroraeosrose Exp $ +// $Id: config.w32.in,v 1.17 2007/09/19 13:38:47 auroraeosrose Exp $ // "Master" config file; think of it as a configure.in equivalent. STDOUT.WriteBlankLines(1); @@ -154,5 +154,5 @@ probe_basic_headers(); -ADD_SOURCES("main", "php_gtk.c php_gtk_ext.w32.c php_gtk_util.c phpg_closure.c phpg_exceptions.c phpg_gboxed.c phpg_gobject.c phpg_gpointer.c phpg_gtype.c phpg_gvalue.c phpg_atom.c phpg_support.c", "php-gtk"); +ADD_SOURCES("main", "php_gtk.c php_gtk_ext.w32.c php_gtk_util.c phpg_closure.c phpg_exceptions.c phpg_gboxed.c phpg_gobject.c phpg_gpointer.c phpg_gtype.c phpg_gvalue.c phpg_atom.c phpg_support.c phpg_paramspec.c", "php-gtk");