cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a gint-gsize-confusion to get rid of a bus error on sparc64

Browse Source 
tested by jasper
This commit is contained in:
sturm 2008-05-31 17:37:53 +00:00
parent 588c785469
commit 46bcb898f8
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
textproc/gtkaml/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2008/05/13 11:19:58 jasper Exp $ # $OpenBSD: Makefile,v 1.3 2008/05/31 17:37:53 sturm Exp $
COMMENT= application markup language for GTK+Vala COMMENT= application markup language for GTK+Vala
DISTNAME= gtkaml-0.2.1.0 DISTNAME= gtkaml-0.2.1.0
PKGNAME= ${DISTNAME}p0
CATEGORIES= textproc CATEGORIES= textproc
HOMEPAGE= http://gtkaml.googlecode.com HOMEPAGE= http://gtkaml.googlecode.com

61
textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c Normal file
View File

@ -0,0 +1,61 @@
$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.1 2008/05/31 17:37:53 sturm Exp $
--- src/GtkamlImplicitsStore.c.orig Tue May 27 13:16:24 2008
+++ src/GtkamlImplicitsStore.c Tue May 27 13:18:01 2008
@@ -67,7 +67,7 @@ enum {
GTKAML_KEY_FILE_WRAPPER_DUMMY_PROPERTY
};
static gboolean gtkaml_key_file_wrapper_has_key (GtkamlKeyFileWrapper* self, const char* group, const char* key);
-static char** gtkaml_key_file_wrapper_get_string_list (GtkamlKeyFileWrapper* self, const char* group, const char* key, int* result_length1);
+static char** gtkaml_key_file_wrapper_get_string_list (GtkamlKeyFileWrapper* self, const char* group, const char* key, gsize* result_length1);
static GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void);
static GObject * gtkaml_key_file_wrapper_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
static gpointer gtkaml_key_file_wrapper_parent_class = NULL;
@@ -136,9 +136,9 @@ static gboolean gtkaml_key_file_wrapper_has_key (Gtkam
}
-static char** gtkaml_key_file_wrapper_get_string_list (GtkamlKeyFileWrapper* self, const char* group, const char* key, int* result_length1) {
+static char** gtkaml_key_file_wrapper_get_string_list (GtkamlKeyFileWrapper* self, const char* group, const char* key, gsize* result_length1) {
GError * inner_error;
- gint _tmp0;
+ gsize _tmp0;
char** _tmp1;
g_return_val_if_fail (GTKAML_IS_KEY_FILE_WRAPPER (self), NULL);
g_return_val_if_fail (group != NULL, NULL);
@@ -304,14 +304,14 @@ GeeList* gtkaml_implicits_store_get_adds (GtkamlImplic
{
if (gtkaml_key_file_wrapper_has_key (kfw, class_name, "adds")) {
char** _tmp1;
- gint kf_adds_length1;
- gint _tmp0;
+ gsize kf_adds_length1;
+ gsize _tmp0;
char** kf_adds;
_tmp1 = NULL;
kf_adds = (_tmp1 = gtkaml_key_file_wrapper_get_string_list (kfw, class_name, "adds", &_tmp0), kf_adds_length1 = _tmp0, _tmp1);
{
char** add_collection;
- int add_it;
+ gsize add_it;
add_collection = kf_adds;
for (add_it = 0; (kf_adds_length1 != -1 && add_it < kf_adds_length1) || (kf_adds_length1 == -1 && add_collection[add_it] != NULL); add_it = add_it + 1) {
const char* _tmp2;
@@ -355,15 +355,15 @@ GeeList* gtkaml_implicits_store_get_method_parameters
{
if (gtkaml_key_file_wrapper_has_key (kfw, class_name, method_name)) {
char** _tmp1;
- gint kf_parameters_length1;
- gint _tmp0;
+ gsize kf_parameters_length1;
+ gsize _tmp0;
char** kf_parameters;
GeeList* _tmp8;
_tmp1 = NULL;
kf_parameters = (_tmp1 = gtkaml_key_file_wrapper_get_string_list (kfw, class_name, method_name, &_tmp0), kf_parameters_length1 = _tmp0, _tmp1);
{
char** parameter_collection;
- int parameter_it;
+ gsize parameter_it;
parameter_collection = kf_parameters;
for (parameter_it = 0; (kf_parameters_length1 != -1 && parameter_it < kf_parameters_length1) || (kf_parameters_length1 == -1 && parameter_collection[parameter_it] != NULL); parameter_it = parameter_it + 1) {
const char* _tmp7;