cvs: php-gtk /ext/gtk+ gdk.overrides gtk.overrides /main phpg_closure.c phpg_gobject.c phpg_gtype.c phpg_support.c

sfox Wed Jan 23 02:31:44 2008 UTC Modified files: /php-gtk/ext/gtk+ gdk.overrides gtk.overrides /php-gtk/main phpg_closure.c phpg_gobject.c phpg_gtype.c phpg_support.c Log: MSVC 6 compiler warnings squashed. http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk.overrides?r1=1.80&r2=1.81&diff_format=u Index: php-gtk/ext/gtk+/gdk.overrides diff -u php-gtk/ext/gtk+/gdk.overrides:1.80 php-gtk/ext/gtk+/gdk.overrides:1.81 --- php-gtk/ext/gtk+/gdk.overrides:1.80 Tue Jan 22 18:47:34 2008 +++ php-gtk/ext/gtk+/gdk.overrides Wed Jan 23 02:31:43 2008 @@ -1944,14 +1944,15 @@ HANDLE cur_proc; HMODULE *modules; DWORD needed, i; - - HMODULE psapi = LoadLibrary("psapi.dll"); + + HMODULE psapi = LoadLibrary("psapi.dll"); + if (!psapi) { php_error(E_ERROR, "Could not load gd functions"); return; } - EnumProcessModules = GetProcAddress(psapi, "EnumProcessModules"); + EnumProcessModules = (GetProcAddress(psapi, "EnumProcessModules"), NULL, 0, 0); if (!EnumProcessModules) { php_error(E_ERROR, "Could not load gd functions"); @@ -1964,13 +1965,13 @@ for (i=0; i < needed/sizeof(HMODULE); i++) { if ((phpi_get_le_gd = (void*)GetProcAddress(modules[i], "phpi_get_le_gd"))) - break; + break; } free(modules); } else { - phpi_get_le_gd = DL_FETCH_SYMBOL(module->handle, "phpi_get_le_gd"); + phpi_get_le_gd = (void*)GetProcAddress(module->handle, "phpi_get_le_gd"); } #else phpi_get_le_gd = DL_FETCH_SYMBOL(module->handle, "phpi_get_le_gd"); @@ -1991,7 +1992,7 @@ for (y = 0; y < gd->sy; y++) { for (x = 0; x < gd->sx; x++) { pixel = gd->tpixels[y][x]; - if (pixel == gd->transparent) { + if (pixel == (uint)gd->transparent) { alpha = 0; } else { alpha = 127 - gdTrueColorGetAlpha(pixel); @@ -2010,7 +2011,7 @@ for (y = 0; y < gd->sy; y++) { for (x = 0; x < gd->sx; x++) { pixel = gd->pixels[y][x]; - if (pixel == gd->transparent) { + if (pixel == (uint)gd->transparent) { alpha = 0; } else { alpha = 127 - gd->alpha[pixel]; http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk.overrides?r1=1.251&r2=1.252&diff_format=u Index: php-gtk/ext/gtk+/gtk.overrides diff -u php-gtk/ext/gtk+/gtk.overrides:1.251 php-gtk/ext/gtk+/gtk.overrides:1.252 --- php-gtk/ext/gtk+/gtk.overrides:1.251 Tue Jan 22 18:47:34 2008 +++ php-gtk/ext/gtk+/gtk.overrides Wed Jan 23 02:31:44 2008 @@ -2314,7 +2314,8 @@ get_active_function_name(TSRMLS_C)); return; } - vectors[i] = Z_LVAL_PP(data); + /* note: the compiler warning thrown here by MSVC6 is due to a compiler bug */ + vectors[i] = Z_DVAL_PP(data); i++; zend_hash_move_forward(Z_ARRVAL_P(points)); } http://cvs.php.net/viewvc.cgi/php-gtk/main/phpg_closure.c?r1=1.20&r2=1.21&diff_format=u Index: php-gtk/main/phpg_closure.c diff -u php-gtk/main/phpg_closure.c:1.20 php-gtk/main/phpg_closure.c:1.21 --- php-gtk/main/phpg_closure.c:1.20 Mon Nov 12 20:30:34 2007 +++ php-gtk/main/phpg_closure.c Wed Jan 23 02:31:44 2008 @@ -259,7 +259,7 @@ g_free(lc_method_name); params = (zval ***)emalloc((n_param_values-1) * sizeof(zval **)); - for (i = 0; i < n_param_values-1; i++) { + for (i = 0; i < (int)n_param_values-1; i++) { params[i] = (zval **) emalloc(sizeof(zval *)); *(params[i]) = NULL; if (phpg_gvalue_to_zval(&param_values[i+1], params[i], FALSE, TRUE TSRMLS_CC) != SUCCESS) { http://cvs.php.net/viewvc.cgi/php-gtk/main/phpg_gobject.c?r1=1.66&r2=1.67&diff_format=u Index: php-gtk/main/phpg_gobject.c diff -u php-gtk/main/phpg_gobject.c:1.66 php-gtk/main/phpg_gobject.c:1.67 --- php-gtk/main/phpg_gobject.c:1.66 Mon Nov 12 20:30:34 2007 +++ php-gtk/main/phpg_gobject.c Wed Jan 23 02:31:44 2008 @@ -706,7 +706,7 @@ } g_signal_query(signal_id, &query); - if (extra && zend_hash_num_elements(Z_ARRVAL_P(extra)) != query.n_params) { + if (extra && zend_hash_num_elements(Z_ARRVAL_P(extra)) != (int)query.n_params) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d parameters needed for signal '%s', %d given", query.n_params, signal, zend_hash_num_elements(Z_ARRVAL_P(extra))); zval_ptr_dtor(&extra); return; @@ -1423,7 +1423,7 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "__gsignals variable has to be an array"); return; } - if (phpg_register_signals(new_type, *signal_decls TSRMLS_CC) == FAILURE) { + if (phpg_register_signals(new_type, *signal_decls) == FAILURE) { return; } zend_hash_del(&class->default_properties, "__gsignals", sizeof("__gsignals")); http://cvs.php.net/viewvc.cgi/php-gtk/main/phpg_gtype.c?r1=1.19&r2=1.20&diff_format=u Index: php-gtk/main/phpg_gtype.c diff -u php-gtk/main/phpg_gtype.c:1.19 php-gtk/main/phpg_gtype.c:1.20 --- php-gtk/main/phpg_gtype.c:1.19 Sun Sep 16 21:55:18 2007 +++ php-gtk/main/phpg_gtype.c Wed Jan 23 02:31:44 2008 @@ -132,7 +132,7 @@ object->type = type; } -PHP_GTK_API GType phpg_gtype_from_class(zend_class_entry *ce) +PHP_GTK_API GType phpg_gtype_from_class(zend_class_entry *ce TSRMLS_DC) { zval **gtype; http://cvs.php.net/viewvc.cgi/php-gtk/main/phpg_support.c?r1=1.19&r2=1.20&diff_format=u Index: php-gtk/main/phpg_support.c diff -u php-gtk/main/phpg_support.c:1.19 php-gtk/main/phpg_support.c:1.20 --- php-gtk/main/phpg_support.c:1.19 Mon Nov 12 20:30:34 2007 +++ php-gtk/main/phpg_support.c Wed Jan 23 02:31:44 2008 @@ -389,7 +389,7 @@ val = (zval *)malloc(sizeof(zval)); INIT_PZVAL(val); ZVAL_LONG(val, eclass->values[i].value); - enum_name = eclass->values[i].value_name; + enum_name = (char *)eclass->values[i].value_name; if (strip_prefix) { for (j = prefix_len; j >= 0; j--) { if (g_ascii_isalpha(enum_name[j]) || enum_name[j] == '_') { @@ -429,7 +429,7 @@ val = (zval *)malloc(sizeof(zval)); INIT_PZVAL(val); ZVAL_LONG(val, eclass->values[i].value); - enum_name = eclass->values[i].value_name; + enum_name = (char *)eclass->values[i].value_name; if (strip_prefix) { for (j = prefix_len; j >= 0; j--) { if (g_ascii_isalpha(enum_name[j]) || enum_name[j] == '_') {