From: Sebastian Dröge <sdroege@src.gnome.org>
Date: Tue, 18 Mar 2008 20:06:04 +0000 (+0000)
Subject: Bug 522292 - Gives warnings in glib/gutils.h with GCC in C99 mode
X-Git-Tag: GLIB_2_17_0~145
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16484fd175d1e294a28bdf00ff32e354c49bc766;p=platform%2Fupstream%2Fglib.git

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.

svn path=/trunk/; revision=6733
---

diff --git a/ChangeLog b/ChangeLog
index 73d9222..28b5af0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-18  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	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.
+
 2008-03-16  Tor Lillqvist  <tml@novell.com>
 
 	* configure.in: Don't bother defining Autoconf variables for
diff --git a/glib/gutils.h b/glib/gutils.h
index cc67ac4..dfc747e 100644
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -101,7 +101,7 @@ G_BEGIN_DECLS
 #  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