From: Sebastian Dröge <sdroege@src.gnome.org>
Date: Wed, 11 Jun 2008 07:37:45 +0000 (+0000)
Subject: Bug 531900 – Use __builtin_offsetof for G_STRUCT_OFFSET if building
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8013b215cdcc5d3bd77083a3c8427418e27f396e;p=dana%2Fcg-glib.git

Bug 531900 – Use __builtin_offsetof for G_STRUCT_OFFSET if building
with gcc 4.0 or newer
* glib/gmacros.h: Use __builtin_offsetof for G_STRUCT_OFFSET if
building with gcc 4.0 or newer.

svn path=/trunk/; revision=6996
---

diff --git a/ChangeLog b/ChangeLog
index 752ee8ed..6ea1d9ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-11  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	Bug 531900 – Use __builtin_offsetof for G_STRUCT_OFFSET if building
+	with gcc 4.0 or newer
+
+	* glib/gmacros.h: Use __builtin_offsetof for G_STRUCT_OFFSET if
+	building with gcc 4.0 or newer.
+
 2008-06-11  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gmain.c
diff --git a/glib/gmacros.h b/glib/gmacros.h
index 395363d7..63174089 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -209,8 +209,15 @@
 /* Provide convenience macros for handling structure
  * fields through their offsets.
  */
-#define G_STRUCT_OFFSET(struct_type, member)	\
-    ((glong) ((guint8*) &((struct_type*) 0)->member))
+
+#if defined(__GNUC__)  && __GNUC__ >= 4
+#  define G_STRUCT_OFFSET(struct_type, member) \
+      ((glong) __builtin_offsetof (struct_type, member))
+#else
+#  define G_STRUCT_OFFSET(struct_type, member)	\
+      ((glong) ((guint8*) &((struct_type*) 0)->member))
+#endif
+
 #define G_STRUCT_MEMBER_P(struct_p, struct_offset)   \
     ((gpointer) ((guint8*) (struct_p) + (glong) (struct_offset)))
 #define G_STRUCT_MEMBER(member_type, struct_p, struct_offset)   \