reapply inlining fix from r6333 to fix: Bug 522292 - Gives warnings in

2008-03-31 10:39:17  Tim Janik  <timj@imendio.com>

        * glib/gutils.h: reapply inlining fix from r6333 to fix:
        Bug 522292 - Gives warnings in glib/gutils.h with GCC in C99 mode
        and again:
        Bug 315437 - extern inline -> static inline

svn path=/trunk/; revision=6789

diff --git a/ChangeLog b/ChangeLog
index 886bc9f..fdb66be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-31 10:39:17  Tim Janik  <timj@imendio.com>
+
+       * glib/gutils.h: reapply inlining fix from r6333 to fix:
+       Bug 522292 – Gives warnings in glib/gutils.h with GCC in C99 mode
+       and again:
+       Bug 315437 – extern inline -> static inline
+
 2008-03-31  Tor Lillqvist  <tml@novell.com>
 
        Bug 525192 - 100% CPU if run main loop with no IO sources

diff --git a/glib/gutils.h b/glib/gutils.h
index dfc747e..6744130 100644 (file)
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -101,11 +101,7 @@ G_BEGIN_DECLS
 #  define G_INLINE_FUNC
 #  undef  G_CAN_INLINE
 #elif defined (__GNUC__) 
-#  if defined (__GNUC_STDC_INLINE__) || defined (__GNUC_GNU_INLINE__)
-#   define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
-#  else
-#   define G_INLINE_FUNC extern inline
-#  endif
+#  define G_INLINE_FUNC static __inline __attribute__ ((unused))
 #elif defined (G_CAN_INLINE) 
 #  define G_INLINE_FUNC static inline
 #else /* can't inline */