From f468602d505e11b42f32732ed2ccc8663c85e546 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 19 Jun 2018 14:23:20 +0200 Subject: [PATCH] shared: support nm_g_slice_free_fcn() for arguments with sizeof() of 10 bytes On m68k architecture, the struct typedef struct { gint64 timestamp_ms; bool dirty; } IP6RoutesTemporaryNotAvailableData; ends up being of a previously unhandled size. Causing a compile time assertion to fail. Support argument sizes of 10 bytes for nm_g_slice_free_fcn(). --- shared/nm-utils/nm-shared-utils.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h index 588552375e..d983cfcd1c 100644 --- a/shared/nm-utils/nm-shared-utils.h +++ b/shared/nm-utils/nm-shared-utils.h @@ -331,6 +331,7 @@ _nm_g_slice_free_fcn_define (1) _nm_g_slice_free_fcn_define (2) _nm_g_slice_free_fcn_define (4) _nm_g_slice_free_fcn_define (8) +_nm_g_slice_free_fcn_define (10) _nm_g_slice_free_fcn_define (12) _nm_g_slice_free_fcn_define (16) @@ -345,6 +346,7 @@ _nm_g_slice_free_fcn_define (16) || ((mem_size) == 2) \ || ((mem_size) == 4) \ || ((mem_size) == 8) \ + || ((mem_size) == 10) \ || ((mem_size) == 12) \ || ((mem_size) == 16)); \ switch ((mem_size)) { \ @@ -352,6 +354,7 @@ _nm_g_slice_free_fcn_define (16) case 2: _fcn = _nm_g_slice_free_fcn_2; break; \ case 4: _fcn = _nm_g_slice_free_fcn_4; break; \ case 8: _fcn = _nm_g_slice_free_fcn_8; break; \ + case 10: _fcn = _nm_g_slice_free_fcn_10; break; \ case 12: _fcn = _nm_g_slice_free_fcn_12; break; \ case 16: _fcn = _nm_g_slice_free_fcn_16; break; \ default: g_assert_not_reached (); _fcn = NULL; break; \