glib r6616 - in trunk: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Mar  3 14:42:32 2008
New Revision: 6616
URL: http://svn.gnome.org/viewvc/glib?rev=6616&view=rev

Log:
2008-03-03  Matthias Clasen  <mclasen redhat com>

        * glib/gutils.h: Add a version of G_INLINE_FUNC for
        __GNUC__ && __GNUC_STDC_INLINE__, patch by Jakub Jelinek



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

Modified: trunk/glib/gutils.h
==============================================================================
--- trunk/glib/gutils.h	(original)
+++ trunk/glib/gutils.h	Mon Mar  3 14:42:32 2008
@@ -97,7 +97,11 @@
 #  define G_INLINE_FUNC
 #  undef  G_CAN_INLINE
 #elif defined (__GNUC__) 
-#  define G_INLINE_FUNC static __inline __attribute__ ((unused))
+#  ifdef __GNUC_STDC_INLINE__
+#   define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
+#  else
+#   define G_INLINE_FUNC extern inline
+#  endif
 #elif defined (G_CAN_INLINE) 
 #  define G_INLINE_FUNC static inline
 #else /* can't inline */