luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 12:25:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

ffi: Marshal flags like enums

Browse Source 
Flags are enums.
Fixes broken marshalling on BE 64bit architectures.

https://bugzilla.gnome.org/show_bug.cgi?id=754882
This commit is contained in:
Ray Strode 2015-09-16 18:01:04 +02:00 committed by Benjamin Otte
parent 846e206146
commit 7b685eab88
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gobject/gclosure.c
View File

@ -1186,9 +1186,15 @@ value_to_ffi_type (const GValue *gvalue,
*value = enum_tmpval; *value = enum_tmpval;
*tmpval_used = TRUE; *tmpval_used = TRUE;
break; break;
case G_TYPE_FLAGS:
g_assert (enum_tmpval != NULL);
rettype = &ffi_type_uint;
*enum_tmpval = g_value_get_flags (gvalue);
*value = enum_tmpval;
*tmpval_used = TRUE;
break;
case G_TYPE_UCHAR: case G_TYPE_UCHAR:
case G_TYPE_UINT: case G_TYPE_UINT:
case G_TYPE_FLAGS:
rettype = &ffi_type_uint; rettype = &ffi_type_uint;
*value = (gpointer)&(gvalue->data[0].v_uint); *value = (gpointer)&(gvalue->data[0].v_uint);
break; break;