diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-07-22 19:58:41 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-07-22 19:58:41 +0200 |
| commit | ef724a37cdb3012efb5b7233eb8b450ad91d3d69 (patch) | |
| tree | 2334455220f417223cc1a75aebe76302cdffdf5a /rt | |
| parent | 6f276c2517990f6569b961b4d4919cbce570ac45 (diff) | |
| parent | 47e5dcdf349a1aea5c8997104ef785412f0d34fa (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
configure.in
elf/rtld.c
misc/syslog.c
sysdeps/gnu/configure
sysdeps/gnu/configure.in
sysdeps/mach/hurd/accept4.c
sysdeps/mach/hurd/bits/posix_opt.h
sysdeps/mach/hurd/dup3.c
sysdeps/mach/hurd/i386/init-first.c
sysdeps/mach/hurd/kernel-features.h
sysdeps/mach/hurd/readlinkat.c
Diffstat (limited to 'rt')
| -rw-r--r-- | rt/bits/mqueue2.h | 2 | ||||
| -rw-r--r-- | rt/mqueue.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rt/bits/mqueue2.h b/rt/bits/mqueue2.h index 87365304c2..b92194a660 100644 --- a/rt/bits/mqueue2.h +++ b/rt/bits/mqueue2.h @@ -34,7 +34,7 @@ __errordecl (__mq_open_wrong_number_of_args, __errordecl (__mq_open_missing_mode_and_attr, "mq_open with O_CREAT in second argument needs 4 arguments"); -__extern_always_inline mqd_t +__fortify_function mqd_t __NTH (mq_open (const char *__name, int __oflag, ...)) { if (__va_arg_pack_len () != 0 && __va_arg_pack_len () != 2) diff --git a/rt/mqueue.h b/rt/mqueue.h index b80d7491b2..9e2eafb18a 100644 --- a/rt/mqueue.h +++ b/rt/mqueue.h @@ -90,7 +90,7 @@ extern int mq_timedsend (mqd_t __mqdes, const char *__msg_ptr, #endif /* Define some inlines helping to catch common problems. */ -#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline \ +#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function \ && defined __va_arg_pack_len # include <bits/mqueue2.h> #endif |