diff options
Diffstat (limited to 'misc/sys')
| -rw-r--r-- | misc/sys/cdefs.h | 20 | ||||
| -rw-r--r-- | misc/sys/syslog.h | 2 |
2 files changed, 15 insertions, 7 deletions
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index ab7d327..bacfe2f 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -281,13 +281,21 @@ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ -#ifdef __GNUC_STDC_INLINE__ -# define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) -# define __extern_always_inline \ +#if !defined __cplusplus || __GNUC_PREREQ (4,3) +# if defined __GNUC_STDC_INLINE__ || defined __cplusplus +# define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) +# define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__)) -#else -# define __extern_inline extern __inline -# define __extern_always_inline extern __always_inline +# else +# define __extern_inline extern __inline +# define __extern_always_inline extern __always_inline +# endif +#endif + +/* GCC 4.3 and above allow passing all anonymous arguments of an + __extern_always_inline function to some other vararg function. */ +#if __GNUC_PREREQ (4,3) +# define __va_arg_pack() __builtin_va_arg_pack () #endif /* It is possible to compile containing GCC extensions even if GCC is diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h index 4ed57c2..22da1ce 100644 --- a/misc/sys/syslog.h +++ b/misc/sys/syslog.h @@ -203,7 +203,7 @@ extern void vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap) /* Define some macros helping to catch buffer overflows. */ -#if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus +#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline # include <bits/syslog.h> #endif #ifdef __LDBL_COMPAT |