Add a version of G_INLINE_FUNC for __GNUC__ && __GNUC_STDC_INLINE__, patch

2008-03-03  Matthias Clasen  <mclasen@redhat.com>

        * glib/gutils.h: Add a version of G_INLINE_FUNC for
        __GNUC__ && __GNUC_STDC_INLINE__, patch by Jakub Jelinek


svn path=/trunk/; revision=6616
This commit is contained in:
Matthias Clasen 2008-03-03 14:42:32 +00:00 committed by Matthias Clasen
parent e826c6710a
commit f3a2e2143f
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2008-03-03 Matthias Clasen <mclasen@redhat.com>
* glib/gutils.h: Add a version of G_INLINE_FUNC for
__GNUC__ && __GNUC_STDC_INLINE__, patch by Jakub Jelinek
2008-03-03 Tor Lillqvist <tml@novell.com> 2008-03-03 Tor Lillqvist <tml@novell.com>
* glib/gspawn-win32.c (read_helper_report): Must set the GError * glib/gspawn-win32.c (read_helper_report): Must set the GError

View File

@ -97,7 +97,11 @@ G_BEGIN_DECLS
# define G_INLINE_FUNC # define G_INLINE_FUNC
# undef G_CAN_INLINE # undef G_CAN_INLINE
#elif defined (__GNUC__) #elif defined (__GNUC__)
# define G_INLINE_FUNC static __inline __attribute__ ((unused)) # ifdef __GNUC_STDC_INLINE__
# define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
# else
# define G_INLINE_FUNC extern inline
# endif
#elif defined (G_CAN_INLINE) #elif defined (G_CAN_INLINE)
# define G_INLINE_FUNC static inline # define G_INLINE_FUNC static inline
#else /* can't inline */ #else /* can't inline */