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
This commit is contained in:
10:39:17 Tim Janik 2008-03-31 08:52:23 +00:00 committed by Tim Janik
parent 3e877f984e
commit e4b7751f44
2 changed files with 8 additions and 5 deletions

View File

@ -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

View File

@ -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 */