From e4b7751f44a5c12b34c0b29df5420163db2619d5 Mon Sep 17 00:00:00 2001 From: "10:39:17 Tim Janik" Date: Mon, 31 Mar 2008 08:52:23 +0000 Subject: [PATCH] reapply inlining fix from r6333 to fix: Bug 522292 - Gives warnings in 2008-03-31 10:39:17 Tim Janik * 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 --- ChangeLog | 7 +++++++ glib/gutils.h | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 886bc9f..fdb66be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-31 10:39:17 Tim Janik + + * 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 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 --- 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 */ -- 2.7.4