glib r7811 - in trunk: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Jan 18 01:03:00 2009
New Revision: 7811
URL: http://svn.gnome.org/viewvc/glib?rev=7811&view=rev

Log:
        * glib/gmacros.h (G_STRUCT_OFFSETOF): Use offsetof instead of
        __builtin_offsetof, for icc's sake. Proposed by Hrvoje Niksic.




Modified:
   trunk/ChangeLog
   trunk/glib/gmacros.h

Modified: trunk/glib/gmacros.h
==============================================================================
--- trunk/glib/gmacros.h	(original)
+++ trunk/glib/gmacros.h	Sun Jan 18 01:03:00 2009
@@ -216,7 +216,7 @@
 
 #if defined(__GNUC__)  && __GNUC__ >= 4
 #  define G_STRUCT_OFFSET(struct_type, member) \
-      ((glong) __builtin_offsetof (struct_type, member))
+      ((glong) offsetof (struct_type, member))
 #else
 #  define G_STRUCT_OFFSET(struct_type, member)	\
       ((glong) ((guint8*) &((struct_type*) 0)->member))