From 19ca2e4ecc981a067c27e4a5e2e169f3dc731dd2 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Mon, 3 Jul 2017 09:11:07 +0200 Subject: [PATCH] alignment: fix armel/armhf/mipsel build failure This commit extends commit faf1e24edf0cc77a189 "zoom-manager: bring back attribute aligned(8)" to both places where the attribute was previously dropped from in commit 63579451b5073b9ce3 "alignment: set alignment on structs". 3.22.3 + commit 6a3d7282ec737 + commit faf1e24edf0cc + this patch has been successfully build tested on Debian armhf porterbox (harris.debian.org). (It also means we end up with exactly the same as the 3.22.2 + patch situation currently shipped in Debian 'stretch' 9.0 regarding alignment/cast fixes.) https://bugzilla.gnome.org/show_bug.cgi?id=784466 --- lib/sp-visualizer-ticks.c | 2 +- lib/sp-visualizer-ticks.h | 2 -- lib/sp-zoom-manager.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/sp-visualizer-ticks.c b/lib/sp-visualizer-ticks.c index cfa5f880..26665edf 100644 --- a/lib/sp-visualizer-ticks.c +++ b/lib/sp-visualizer-ticks.c @@ -34,7 +34,7 @@ struct _SpVisualizerTicks gint64 epoch; gint64 begin_time; gint64 end_time; -}; +} __attribute__((aligned(8))); enum { TICK_MINUTES, diff --git a/lib/sp-visualizer-ticks.h b/lib/sp-visualizer-ticks.h index ed7d2829..5efeee36 100644 --- a/lib/sp-visualizer-ticks.h +++ b/lib/sp-visualizer-ticks.h @@ -25,8 +25,6 @@ G_BEGIN_DECLS #define SP_TYPE_VISUALIZER_TICKS (sp_visualizer_ticks_get_type()) -typedef struct _SpVisualizerTicks SpVisualizerTicks __attribute__((aligned(8))); - G_DECLARE_FINAL_TYPE (SpVisualizerTicks, sp_visualizer_ticks, SP, VISUALIZER_TICKS, GtkDrawingArea) GtkWidget *sp_visualizer_ticks_new (void); diff --git a/lib/sp-zoom-manager.h b/lib/sp-zoom-manager.h index 719b3c08..ca2a7865 100644 --- a/lib/sp-zoom-manager.h +++ b/lib/sp-zoom-manager.h @@ -25,8 +25,6 @@ G_BEGIN_DECLS #define SP_TYPE_ZOOM_MANAGER (sp_zoom_manager_get_type()) -typedef struct _SpZoomManager SpZoomManager __attribute__((aligned(8))); - G_DECLARE_FINAL_TYPE (SpZoomManager, sp_zoom_manager, SP, ZOOM_MANAGER, GObject) SpZoomManager *sp_zoom_manager_new (void);