From 3a98ecfa0edce51c5ed8446bc3a74efc6ec6ac65 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 29 Mar 2022 18:21:49 +0200 Subject: [PATCH] platform: make NMPlatformVTableAddress struct smaller and pack NMPObjectType (cherry picked from commit 7c92663f8d79375c78f6917d4c6e005d7accf2a6) --- src/libnm-platform/nm-platform.h | 6 +++--- src/libnm-platform/nmp-base.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libnm-platform/nm-platform.h b/src/libnm-platform/nm-platform.h index c6d6d6917a..93b644a3d8 100644 --- a/src/libnm-platform/nm-platform.h +++ b/src/libnm-platform/nm-platform.h @@ -776,10 +776,10 @@ typedef struct { #undef __NMPlatformObjWithIfindex_COMMON typedef struct { - gboolean is_ip4; + bool is_ip4; + gint8 addr_family; + guint8 sizeof_route; NMPObjectType obj_type; - int addr_family; - gsize sizeof_route; int (*route_cmp)(const NMPlatformIPXRoute *a, const NMPlatformIPXRoute *b, NMPlatformIPRouteCmpType cmp_type); diff --git a/src/libnm-platform/nmp-base.h b/src/libnm-platform/nmp-base.h index a80fd4d389..4863168855 100644 --- a/src/libnm-platform/nmp-base.h +++ b/src/libnm-platform/nmp-base.h @@ -110,7 +110,7 @@ typedef struct _NMPlatformIP6Route NMPlatformIP6Route; typedef struct _NMPlatformLink NMPlatformLink; typedef struct _NMPObject NMPObject; -typedef enum { +typedef enum _nm_packed { NMP_OBJECT_TYPE_UNKNOWN, NMP_OBJECT_TYPE_LINK,