mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-06-11 18:38:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fpi-device: Adjust padding based on actual gpointer size

Browse Source 
In some architectures pointer size is different. So let's adapt it to it
This commit is contained in:
Marco Trevisan (Treviño)
2021-10-31 19:19:41 +01:00
parent 77ff30e19d
commit ec8a9ba0fd
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libfprint/fpi-device.h
+12
View File
@@ -73,7 +73,13 @@ struct _FpIdEntry
/*< private >*/ /*< private >*/
/* padding for future expansion */ /* padding for future expansion */
#if GLIB_SIZEOF_VOID_P == 8
gpointer _padding_dummy[13]; gpointer _padding_dummy[13];
#elif GLIB_SIZEOF_VOID_P == 4
gpointer _padding_dummy[11];
#else
G_STATIC_ASSERT("Unexpected pointer size")
#endif
}; };
/** /**
@@ -186,7 +192,13 @@ struct _FpDeviceClass
/*< private >*/ /*< private >*/
/* padding for future expansion */ /* padding for future expansion */
#if GLIB_SIZEOF_VOID_P == 8
gpointer _padding_dummy[27]; gpointer _padding_dummy[27];
#elif GLIB_SIZEOF_VOID_P == 4
gpointer _padding_dummy[26];
#else
G_STATIC_ASSERT("Unexpected pointer size")
#endif
}; };
void fpi_device_class_auto_initialize_features (FpDeviceClass *device_class); void fpi_device_class_auto_initialize_features (FpDeviceClass *device_class);
tests/test-fp-todv1-types.c
+2 -2
View File
@@ -109,13 +109,13 @@ check_compatiblity_auto (GType old_type, GType current_type)
type ## TODV ## major ## _ ## minor ## _ ## micro type ## TODV ## major ## _ ## minor ## _ ## micro
#define check_struct_size(type, major, minor, micro) \ #define check_struct_size(type, major, minor, micro) \
g_debug ("Checking " # type " size @ " G_STRLOC); \ g_debug ("Checking " # type " v" #major "." #minor "." #micro " size @ " G_STRLOC); \
g_assert_cmpuint (sizeof (tod_versioned_type (type, major, minor, micro)), \ g_assert_cmpuint (sizeof (tod_versioned_type (type, major, minor, micro)), \
==, \ ==, \
sizeof (type)) sizeof (type))
#define check_struct_member(type, major, minor, micro, member) \ #define check_struct_member(type, major, minor, micro, member) \
g_debug ("Checking " # type "'s " # member " offset @ " G_STRLOC); \ g_debug ("Checking " # type " v" #major "." #minor "." #micro "'s " # member " offset @ " G_STRLOC); \
g_assert_cmpuint (G_STRUCT_OFFSET (tod_versioned_type (type, major, minor, micro), member), \ g_assert_cmpuint (G_STRUCT_OFFSET (tod_versioned_type (type, major, minor, micro), member), \
==, \ ==, \
G_STRUCT_OFFSET (type, member)) G_STRUCT_OFFSET (type, member))
tests/tod-drivers/base-fpi-device.h
+12
View File
@@ -172,7 +172,13 @@ struct _FpIdEntryTODV1_92_0
/*< private >*/ /*< private >*/
/* padding for future expansion */ /* padding for future expansion */
#if GLIB_SIZEOF_VOID_P == 8
gpointer _padding_dummy[13]; gpointer _padding_dummy[13];
#elif GLIB_SIZEOF_VOID_P == 4
gpointer _padding_dummy[11];
#else
G_STATIC_ASSERT("Unexpected pointer size")
#endif
}; };
typedef struct _FpIdEntryTODV1_92_0 FpIdEntryTODV1_92_0; typedef struct _FpIdEntryTODV1_92_0 FpIdEntryTODV1_92_0;
@@ -260,7 +266,13 @@ struct _FpDeviceClassTODV1_94_0
/*< private >*/ /*< private >*/
/* padding for future expansion */ /* padding for future expansion */
#if GLIB_SIZEOF_VOID_P == 8
gpointer _padding_dummy[27]; gpointer _padding_dummy[27];
#elif GLIB_SIZEOF_VOID_P == 4
gpointer _padding_dummy[26];
#else
G_STATIC_ASSERT("Unexpected pointer size")
#endif
}; };
typedef struct _FpDeviceClassTODV1_94_0 FpDeviceClassTODV1_94_0; typedef struct _FpDeviceClassTODV1_94_0 FpDeviceClassTODV1_94_0;