bz#15007: Fix mismatch of guards for qecvt

[Andreas Jaeger]

On 04/26/2013 06:25 PM, Roland McGrath wrote:
> Yes, that's what I meant.
> .
>

Thanks, then here's the full patch that I will commit later (after a
full compile of glibc),

Andreas

2013-04-26  Andreas Jaeger  <aj@suse.de>

	[BZ #15007]
	* stdlib/stdlib.h: Update guards for qecvt.
	* stdlib/bits/stdlib-ldbl.h: Sync guards for qecvt etc with
	<stdlib.h>.

diff --git a/stdlib/bits/stdlib-ldbl.h b/stdlib/bits/stdlib-ldbl.h
index 1e1bcef..a606fd3 100644
--- a/stdlib/bits/stdlib-ldbl.h
+++ b/stdlib/bits/stdlib-ldbl.h
@@ -30,12 +30,10 @@ __END_NAMESPACE_C99
  __LDBL_REDIR1_DECL (strtold_l, strtod_l)
  #endif

-#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED
-# ifdef __USE_MISC
+#ifdef __USE_MISC
  __LDBL_REDIR1_DECL (qecvt, ecvt)
  __LDBL_REDIR1_DECL (qfcvt, fcvt)
  __LDBL_REDIR1_DECL (qgcvt, gcvt)
  __LDBL_REDIR1_DECL (qecvt_r, ecvt_r)
  __LDBL_REDIR1_DECL (qfcvt_r, fcvt_r)
-# endif
  #endif
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 4b83944..99a830d 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -823,9 +823,9 @@ extern char *fcvt (double __value, int __ndigit, int 
*__restrict __decpt,
     be written to BUF.  */
  extern char *gcvt (double __value, int __ndigit, char *__buf)
       __THROW __nonnull ((3)) __wur;
+#endif

-
-# ifdef __USE_MISC
+#ifdef __USE_MISC
  /* Long double versions of above functions.  */
  extern char *qecvt (long double __value, int __ndigit,
  		    int *__restrict __decpt, int *__restrict __sign)
@@ -854,8 +854,7 @@ extern int qfcvt_r (long double __value, int __ndigit,
  		    int *__restrict __decpt, int *__restrict __sign,
  		    char *__restrict __buf, size_t __len)
       __THROW __nonnull ((3, 4, 5));
-# endif	/* misc */
-#endif	/* use MISC || use X/Open Unix */
+#endif	/* misc */


  __BEGIN_NAMESPACE_STD

-- 
  Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
   SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
    GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
     GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126