summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--girepository/gicallableinfo.c4
-rw-r--r--girepository/gthash.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c
index bfbcc255..5f923d1a 100644
--- a/girepository/gicallableinfo.c
+++ b/girepository/gicallableinfo.c
@@ -535,7 +535,7 @@ gi_type_info_extract_ffi_return_value (GITypeInfo *return_info,
arg->v_int32 = (gint32) ffi_value->v_long;
break;
default:
- arg->v_pointer = (gpointer) ffi_value->v_ulong;
+ arg->v_pointer = (gpointer) ffi_value->v_pointer;
break;
}
@@ -543,7 +543,7 @@ gi_type_info_extract_ffi_return_value (GITypeInfo *return_info,
}
break;
default:
- arg->v_pointer = (gpointer) ffi_value->v_ulong;
+ arg->v_pointer = (gpointer) ffi_value->v_pointer;
break;
}
}
diff --git a/girepository/gthash.c b/girepository/gthash.c
index 7440913a..2fda9035 100644
--- a/girepository/gthash.c
+++ b/girepository/gthash.c
@@ -158,7 +158,7 @@ _gi_typelib_hash_builder_pack (GITypelibHashBuilder *builder, guint8* mem, guint
g_return_if_fail (builder->buildable);
g_assert (len >= builder->packed_size);
- g_assert ((((unsigned long)mem) & 0x3) == 0);
+ g_assert ((((size_t)mem) & 0x3) == 0);
memset (mem, 0, len);
@@ -202,7 +202,7 @@ _gi_typelib_hash_search (guint8* memory, const char *str, guint n_entries)
guint32 dirmap_offset;
guint32 offset;
- g_assert ((((unsigned long)memory) & 0x3) == 0);
+ g_assert ((((size_t)memory) & 0x3) == 0);
mph = ((guint32*)memory)+1;
offset = cmph_search_packed (mph, str, strlen (str));