diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-02-27 14:00:47 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-02-27 14:00:47 -0800 |
| commit | 36c8acb4f8383a52ba0f25a99276ebec31f8c281 (patch) | |
| tree | 814f5fbb3b8c5d8461f8d5ba1034291ee4d18355 | |
| parent | 84ad622bbf4b1c22f68414532f5a8a88557bf9bd (diff) | |
| download | glibc-36c8acb4f8383a52ba0f25a99276ebec31f8c281.tar.gz glibc-36c8acb4f8383a52ba0f25a99276ebec31f8c281.tar.xz glibc-36c8acb4f8383a52ba0f25a99276ebec31f8c281.zip | |
BZ#13775: Fix vdprintf/dprintf ldbl-compat decl feature test conditional.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libio/bits/stdio-ldbl.h | 7 | ||||
| -rw-r--r-- | libio/stdio.h | 7 |
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 22dd447751..e4e48b588b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-02-27 Roland McGrath <roland@hack.frob.com> + [BZ #13775] + * libio/bits/stdio-ldbl.h (vdprintf, dprintf): Put these under + [__USE_XOPEN2K8] rather than [__USE_GNU], to match the stdio.h decls. + * libio/stdio.h (vdprintf, dprintf): Remove comment about these not + being in POSIX, because they are in 1003.1-2008. + * rt/tst-aio.c: Include <fcntl.h>. * rt/tst-aio7.c: Likewise. * rt/tst-aio64.c: Likewise. diff --git a/libio/bits/stdio-ldbl.h b/libio/bits/stdio-ldbl.h index 34b139bf92..5700dd9d7d 100644 --- a/libio/bits/stdio-ldbl.h +++ b/libio/bits/stdio-ldbl.h @@ -1,5 +1,5 @@ /* -mlong-double-64 compatibility mode for stdio functions. - Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2006-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -62,9 +62,12 @@ __LDBL_REDIR_DECL (vscanf) __END_NAMESPACE_C99 #endif -#ifdef __USE_GNU +#ifdef __USE_XOPEN2K8 __LDBL_REDIR_DECL (vdprintf) __LDBL_REDIR_DECL (dprintf) +#endif + +#ifdef __USE_GNU __LDBL_REDIR_DECL (vasprintf) __LDBL_REDIR_DECL (__asprintf) __LDBL_REDIR_DECL (asprintf) diff --git a/libio/stdio.h b/libio/stdio.h index 4c732c4e11..c69b382da1 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -408,12 +408,7 @@ extern int asprintf (char **__restrict __ptr, #endif #ifdef __USE_XOPEN2K8 -/* Write formatted output to a file descriptor. - - These functions are not part of POSIX and therefore no official - cancellation point. But due to similarity with an POSIX interface - or due to the implementation they are cancellation points and - therefore not marked with __THROW. */ +/* Write formatted output to a file descriptor. */ extern int vdprintf (int __fd, const char *__restrict __fmt, _G_va_list __arg) __attribute__ ((__format__ (__printf__, 2, 0))); |