glib r6789 - in trunk: . glib

[timj svn gnome org]

Author: timj
Date: Mon Mar 31 09:52:23 2008
New Revision: 6789
URL: http://svn.gnome.org/viewvc/glib?rev=6789&view=rev

Log:
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




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

Modified: trunk/glib/gutils.h
==============================================================================
--- trunk/glib/gutils.h	(original)
+++ trunk/glib/gutils.h	Mon Mar 31 09:52:23 2008
@@ -101,11 +101,7 @@
 #  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 */