From 344d5cb2a9cc60d017c8823a66f650d52bd93ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Tue, 13 Apr 2021 15:40:06 +0200
Subject: [PATCH] fpi-device: Reduce padding on FpIdEntry to make space to new
 elements

---
 libfprint/fpi-device.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libfprint/fpi-device.h b/libfprint/fpi-device.h
index dcb2a42d..9bce196e 100644
--- a/libfprint/fpi-device.h
+++ b/libfprint/fpi-device.h
@@ -55,6 +55,12 @@ struct _FpIdEntry
       guint vid;
     };
     const gchar *virtual_envvar;
+  };
+  guint64 driver_data;
+
+  /* Elements added after TODv1 */
+  union
+  {
     struct
     {
       FpiDeviceUdevSubtypeFlags udev_types;
@@ -66,11 +72,10 @@ struct _FpIdEntry
       } hid_id;
     };
   };
-  guint64 driver_data;
 
   /*< private >*/
   /* padding for future expansion */
-  gpointer _padding_dummy[16];
+  gpointer _padding_dummy[13];
 };
 
 /**