luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 02:36:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cope with gcc 4.3 changed 'extern inline' semantics. (#315437, patch by

Browse Source 
2008-01-06  Matthias Clasen  <mclasen@redhat.com>

        * glib/gutils.h: Cope with gcc 4.3 changed 'extern inline'
        semantics.  (#315437, patch by Loïc Minier)



svn path=/trunk/; revision=6254
This commit is contained in:
Matthias Clasen 2008-01-07 03:08:37 +00:00 committed by Matthias Clasen
parent 6554c8509f
commit 3f15a98f8d
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-01-06 Matthias Clasen <mclasen@redhat.com>
* glib/gutils.h: Cope with gcc 4.3 changed 'extern inline'
semantics. (#315437, patch by Loïc Minier)
2008-01-06 Matthias Clasen <mclasen@redhat.com> 2008-01-06 Matthias Clasen <mclasen@redhat.com>
* glib/gspawn.c (fdwalk): Don't set open_max to * glib/gspawn.c (fdwalk): Don't set open_max to

19
glib/gutils.h
View File

@ -69,6 +69,18 @@ G_BEGIN_DECLS
# endif /* va_list is a pointer */ # endif /* va_list is a pointer */
#endif /* !G_VA_COPY */ #endif /* !G_VA_COPY */
/* need this utility macro, but it's not always present in system headers
* copy it from linux features.h for those who need it
*/
#ifndef __GNUC_PREREQ
#if defined __GNUC__ && defined __GNUC_MINOR__
# define __GNUC_PREREQ(maj, min) \
((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
#else
# define __GNUC_PREREQ(maj, min) 0
#endif
#endif
/* inlining hassle. for compilers that don't allow the `inline' keyword, /* inlining hassle. for compilers that don't allow the `inline' keyword,
* mostly because of strict ANSI C compliance or dumbness, we try to fall * mostly because of strict ANSI C compliance or dumbness, we try to fall
* back to either `__inline__' or `__inline'. * back to either `__inline__' or `__inline'.
@ -97,7 +109,12 @@ 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 extern inline # if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \
&& __STDC_VERSION__ >= 199901L
# 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 */