From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-8843-listarch-libc-hacker=sources.redhat.com@sourceware.org>
Received: (qmail 12918 invoked by alias); 3 Feb 2006 13:51:30 -0000
Received: (qmail 12829 invoked by uid 22791); 3 Feb 2006 13:51:29 -0000
X-Spam-Check-By: sourceware.org
Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26)
    by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 03 Feb 2006 13:51:28 +0000
Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id k13DpA5p026606;
	Fri, 3 Feb 2006 14:51:10 +0100
Received: (from jj@localhost)
	by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id k13Dp9N8026605;
	Fri, 3 Feb 2006 14:51:09 +0100
Date: Fri, 03 Feb 2006 13:51:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Roland McGrath <roland@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix stdlib-ldbl.h
Message-ID: <20060203135109.GF4625@sunsite.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sourceware.org>
List-Help: <mailto:libc-hacker-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: libc-hacker-owner@sourceware.org
X-SW-Source: 2006-02/txt/msg00014.txt.bz2

Hi!

qecvt etc. are prototyped
#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED
...
# ifdef __USE_MISC
... qecvt (...);
# endif
#endif
so the __LDBL_REDIR1_DECL has to match that.
This broke emacs build with -mlong-double-64.

2006-02-03  Jakub Jelinek  <jakub@redhat.com>

	* stdlib/bits/stdlib-ldbl.h (qecvt, qfcvt, qgcvt, qecvt_r,
	qfcvt_r): Guard with #if defined __USE_SVID || defined
	__USE_XOPEN_EXTENDED.

--- libc/stdlib/bits/stdlib-ldbl.h	2006-01-14 21:14:36.000000000 +0100
+++ libc/stdlib/bits/stdlib-ldbl.h	2006-02-03 10:46:07.000000000 +0100
@@ -33,10 +33,12 @@ __LDBL_REDIR1_DECL (strtold_l, strtod_l)
 
 __LDBL_REDIR1_DECL (__strtold_internal, __strtod_internal)
 
-#ifdef __USE_MISC
+#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED
+# 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

	Jakub