Add a version of G_INLINE_FUNC for __GNUC__ && __GNUC_STDC_INLINE__, patch

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

svn path=/trunk/; revision=6616

diff --git a/ChangeLog b/ChangeLog
index b9c0320..2a80d33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
+
 2008-03-03  Tor Lillqvist  <tml@novell.com>
 
        * glib/gspawn-win32.c (read_helper_report): Must set the GError

diff --git a/glib/gutils.h b/glib/gutils.h
index 697900d..4b72589 100644 (file)
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -97,7 +97,11 @@ G_BEGIN_DECLS
 #  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 */