From owner-svn-src-all@FreeBSD.ORG  Wed Jan 28 05:18:21 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 936C11065672;
	Wed, 28 Jan 2009 05:18:21 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 815348FC1E;
	Wed, 28 Jan 2009 05:18:21 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0S5ILpJ008199;
	Wed, 28 Jan 2009 05:18:21 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0S5ILRZ008198;
	Wed, 28 Jan 2009 05:18:21 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <200901280518.n0S5ILRZ008198@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Wed, 28 Jan 2009 05:18:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187811 - in stable/7/lib/msun: . src
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2009 05:18:22 -0000

Author: das
Date: Wed Jan 28 05:18:21 2009
New Revision: 187811
URL: http://svn.freebsd.org/changeset/base/187811

Log:
  MFC r186886:
  
    Fix the types of INFINITY and NAN, which were broken in r131851. They
    should both be floats, not doubles.
  
    PR:		127795

Modified:
  stable/7/lib/msun/   (props changed)
  stable/7/lib/msun/src/math.h

Modified: stable/7/lib/msun/src/math.h
==============================================================================
--- stable/7/lib/msun/src/math.h	Wed Jan 28 05:07:16 2009	(r187810)
+++ stable/7/lib/msun/src/math.h	Wed Jan 28 05:18:21 2009	(r187811)
@@ -55,8 +55,8 @@ extern const union __nan_un {
 #ifdef __MATH_BUILTIN_CONSTANTS
 #define	HUGE_VALF	__builtin_huge_valf()
 #define	HUGE_VALL	__builtin_huge_vall()
-#define	INFINITY	__builtin_inf()
-#define	NAN		__builtin_nan("")
+#define	INFINITY	__builtin_inff()
+#define	NAN		__builtin_nanf("")
 #else
 #define	HUGE_VALF	(float)HUGE_VAL
 #define	HUGE_VALL	(long double)HUGE_VAL