glib r6733 - in trunk: . glib

[sdroege svn gnome org]

Author: sdroege
Date: Tue Mar 18 20:06:04 2008
New Revision: 6733
URL: http://svn.gnome.org/viewvc/glib?rev=6733&view=rev

Log:
Bug 522292 - Gives warnings in glib/gutils.h with GCC in C99 mode
* glib/gutils.h: Use "__attribute__ ((__gnu_inline__))" for inlining
if either __GNUC_STDC_INLINE__ or __GNUC_GNU_INLINE__ are defined. In
gcc version prior to 4.3 no correct C99-inline was implemented which
has semantic differences to GNU inline.


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

Modified: trunk/glib/gutils.h
==============================================================================
--- trunk/glib/gutils.h	(original)
+++ trunk/glib/gutils.h	Tue Mar 18 20:06:04 2008
@@ -101,7 +101,7 @@
 #  define G_INLINE_FUNC
 #  undef  G_CAN_INLINE
 #elif defined (__GNUC__) 
-#  ifdef __GNUC_STDC_INLINE__
+#  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