[gtk+] gtktextattributes: Use an anonymous union instead of arch-testing #ifdef
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtktextattributes: Use an anonymous union instead of arch-testing #ifdef
- Date: Sun, 3 Nov 2013 16:16:38 +0000 (UTC)
commit c9892df362817c90b05678aef6a519f607c66692
Author: Colin Walters <walters verbum org>
Date: Wed Oct 30 11:26:48 2013 -0400
gtktextattributes: Use an anonymous union instead of arch-testing #ifdef
This avoids having Gtk-3.0.gir differ on 32 vs 64 bit, which causes
issues for "multilib" in Fedora/OpenSUSE type systems.
See https://bugzilla.gnome.org/show_bug.cgi?id=711153 for more
information.
https://bugzilla.gnome.org/show_bug.cgi?id=711158
gtk/gtktextattributes.h | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributes.h
index d712dbe..616fc8b 100644
--- a/gtk/gtktextattributes.h
+++ b/gtk/gtktextattributes.h
@@ -94,12 +94,10 @@ struct _GtkTextAppearance
guint inside_selection : 1;
guint is_text : 1;
- GdkRGBA *rgba[2];
-
-#if (defined(__SIZEOF_INT__) && defined(__SIZEOF_POINTER__)) && (__SIZEOF_INT__ == __SIZEOF_POINTER__)
- /* unusable, just for ABI compat */
- guint padding[2];
-#endif
+ union {
+ GdkRGBA *rgba[2];
+ guint padding[4];
+ };
};
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]