BZ#13775: Fix vdprintf/dprintf ldbl-compat decl feature test conditional.

diff --git a/ChangeLog b/ChangeLog
index 22dd447..e4e48b5 100644 (file)
--- 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 34b139b..5700dd9 100644 (file)
--- 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 4c732c4..c69b382 100644 (file)
--- 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)));