Declare ecvt, fcvt, gcvt, mktemp in stdlib.h for XOPEN2K (bug 14824).

diff --git a/ChangeLog b/ChangeLog
index 7808ff83b73dd0083f5508743b512a1eea1c9ea0..9b14a40303c1e2e5f1114dab42610d0ff3913e47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2012-11-09  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #14824]
+       * stdlib/stdlib.h [__USE_XOPEN_EXTENDED && __USE_XOPEN2K]
+       (mktemp): Enable declaration.
+       [__USE_XOPEN_EXTENDED && __USE_XOPEN2K] (ecvt): Likewise.
+       [__USE_XOPEN_EXTENDED && __USE_XOPEN2K] (fcvt): Likewise.
+       [__USE_XOPEN_EXTENDED && __USE_XOPEN2K] (gcvt): Likewise.
+       [__USE_XOPEN_EXTENDED && __USE_XOPEN2K && __USE_MISC] (qecvt):
+       Likewise.
+       [__USE_XOPEN_EXTENDED && __USE_XOPEN2K && __USE_MISC] (qfcvt):
+       Likewise.
+       [__USE_XOPEN_EXTENDED && __USE_XOPEN2K && __USE_MISC] (qgcvt):
+       Likewise.
+       [__USE_XOPEN_EXTENDED && __USE_XOPEN2K && __USE_MISC] (ecvt_r):
+       Likewise.
+       [__USE_XOPEN_EXTENDED && __USE_XOPEN2K && __USE_MISC] (fcvt_r):
+       Likewise.
+       [__USE_XOPEN_EXTENDED && __USE_XOPEN2K && __USE_MISC] (gcvt_r):
+       Likewise.
+
        [BZ #14821]
        * sunrpc/clnt_tcp.c (clnttcp_control): Access values at fixed
        offset in buffer as u_int32_t not u_long.  Consistently use memcpy

diff --git a/NEWS b/NEWS
index fa49ee5f3b25aff5452503e8e5c22449b5be6298..4fbf70d41d0167645ba28b86fb799b9d5b164a38 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ Version 2.17
   14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621,
   14638, 14645, 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716,
   14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805,
-  14807, 14809, 14811, 14815, 14821.
+  14807, 14809, 14811, 14815, 14821, 14824.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and

diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 0eb982cbbcea3d787354bf6275eb39d8886a9d9c..fc83f4e95473de71577ce657a3d803a321973449 100644 (file)
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -596,7 +596,7 @@ extern int clearenv (void) __THROW;
 
 
 #if defined __USE_MISC \
-    || (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K)
+    || (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8)
 /* Generate a unique temporary file name from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
    they are replaced with a string that makes the file name unique.
@@ -796,7 +796,7 @@ __END_NAMESPACE_C99
 #endif
 
 
-#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8) \
     || defined __USE_SVID
 /* Convert floating point numbers to strings.  The returned values are
    valid only until another call to the same function.  */