From owner-p4-projects@FreeBSD.ORG  Mon Jul 21 18:38:53 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DFD3237B404; Mon, 21 Jul 2003 18:38:52 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 705F537B401
	for <perforce@freebsd.org>; Mon, 21 Jul 2003 18:38:52 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B5BD443F93
	for <perforce@freebsd.org>; Mon, 21 Jul 2003 18:38:51 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M1cp0U026488
	for <perforce@freebsd.org>; Mon, 21 Jul 2003 18:38:51 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M1cp1j026485
	for perforce@freebsd.org; Mon, 21 Jul 2003 18:38:51 -0700 (PDT)
Date: Mon, 21 Jul 2003 18:38:51 -0700 (PDT)
Message-Id: <200307220138.h6M1cp1j026485@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 34803 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jul 2003 01:38:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=34803

Change 34803 by peter@peter_hammer on 2003/07/21 18:38:45

	OK, c++ sucks.

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/ieeefp.h#4 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#4 (text+ko) ====

@@ -111,7 +111,7 @@
 #define	SSE_RND_OFF	13	/* rounding control offset */
 #define	SSE_FZ_OFF	15	/* flush to zero offset */
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__cplusplus)
 
 #define	__fldenv(addr)	__asm __volatile("fldenv %0" : : "m" (*(addr)))
 #define	__fnstenv(addr)	__asm __volatile("fnstenv %0" : "=m" (*(addr)))
@@ -175,7 +175,7 @@
 	return ((_cw & FP_PRC_FLD) >> FP_PRC_OFF);
 }
 
-static __inline__ fp_rnd_t
+static __inline__ fp_prec_t
 fpsetprec(fp_rnd_t _m)
 {
 	unsigned short _cw;
@@ -263,6 +263,14 @@
 /* Suppress prototypes in the MI header. */
 #define	_IEEEFP_INLINED_	1
 
-#endif /* __GNUC__ */
+#else /* __GNUC__ && !__cplusplus */
+
+/* Augment the userland declarations */
+__BEGIN_DECLS
+extern fp_prec_t fpgetprec(void);
+extern fp_prec_t fpsetprec(fp_prec_t);
+__END_DECLS
+
+#endif /* __GNUC__ && !__cplusplus */
 
 #endif /* !_MACHINE_IEEEFP_H_ */