8 files changed, 25 insertions, 18 deletions

diff --git a/include/ieeefp.h b/include/ieeefp.h
index 37cd9a969efd..d439efa3575a 100644
--- a/include/ieeefp.h
+++ b/include/ieeefp.h
@@ -1,4 +1,5 @@
 /*	$NetBSD: ieeefp.h,v 1.4 1998/01/09 08:03:43 perry Exp $	*/
+/* $FreeBSD$ */
 
 /* 
  * Written by J.T. Conklin, Apr 6, 1995
@@ -15,12 +16,12 @@
 #include <machine/floatingpoint.h>
 #else /* !__i386__ */
 __BEGIN_DECLS
-extern fp_rnd    fpgetround __P((void));
-extern fp_rnd    fpsetround __P((fp_rnd));
-extern fp_except fpgetmask __P((void));
-extern fp_except fpsetmask __P((fp_except));
-extern fp_except fpgetsticky __P((void));
-extern fp_except fpsetsticky __P((fp_except));
+extern fp_rnd_t    fpgetround __P((void));
+extern fp_rnd_t    fpsetround __P((fp_rnd_t));
+extern fp_except_t fpgetmask __P((void));
+extern fp_except_t fpsetmask __P((fp_except_t));
+extern fp_except_t fpgetsticky __P((void));
+extern fp_except_t fpsetsticky __P((fp_except_t));
 __END_DECLS
 #endif /* __i386__ */
 
diff --git a/lib/libc/alpha/gen/fpgetmask.c b/lib/libc/alpha/gen/fpgetmask.c
index 516ae981d55c..466ec214e07e 100644
--- a/lib/libc/alpha/gen/fpgetmask.c
+++ b/lib/libc/alpha/gen/fpgetmask.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: fpgetmask.c,v 1.1 1995/04/29 05:10:55 cgd Exp $	*/
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou
@@ -39,11 +40,11 @@ struct params {
         u_int64_t mask;
 };
 
-fp_except
+fp_except_t
 fpgetmask()
 {
         struct params p;
 
 	sysarch(ALPHA_GET_FPMASK, (char *) &p);
-	return((fp_except) p.mask);
+	return((fp_except_t) p.mask);
 }
diff --git a/lib/libc/alpha/gen/fpgetround.c b/lib/libc/alpha/gen/fpgetround.c
index 46976c2e4c11..551e65eea78a 100644
--- a/lib/libc/alpha/gen/fpgetround.c
+++ b/lib/libc/alpha/gen/fpgetround.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: fpgetround.c,v 1.1 1995/04/29 05:09:55 cgd Exp $	*/
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou
@@ -35,7 +36,7 @@
 #include <ieeefp.h>
 #include <machine/fpu.h>
 
-fp_rnd
+fp_rnd_t
 fpgetround()
 {
 	double fpcrval;
diff --git a/lib/libc/alpha/gen/fpgetsticky.c b/lib/libc/alpha/gen/fpgetsticky.c
index c0ff4d75c88a..c74eafd5af02 100644
--- a/lib/libc/alpha/gen/fpgetsticky.c
+++ b/lib/libc/alpha/gen/fpgetsticky.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: fpgetsticky.c,v 1.1 1995/04/29 05:10:59 cgd Exp $	*/
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou
@@ -35,7 +36,7 @@
 #include <ieeefp.h>
 #include <machine/fpu.h>
 
-fp_except
+fp_except_t
 fpgetsticky()
 {
 	double fpcrval;
diff --git a/lib/libc/alpha/gen/fpsetmask.c b/lib/libc/alpha/gen/fpsetmask.c
index 05201ce81d40..72c3a5495d8a 100644
--- a/lib/libc/alpha/gen/fpsetmask.c
+++ b/lib/libc/alpha/gen/fpsetmask.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: fpsetmask.c,v 1.1 1995/04/29 05:11:01 cgd Exp $	*/
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou
@@ -39,13 +40,13 @@ struct params {
 	u_int64_t mask;
 };
 
-fp_except
+fp_except_t
 fpsetmask(mask)
-	fp_except mask;
+	fp_except_t mask;
 {
 	struct params p;
 
 	p.mask = (u_int64_t) mask;
 	sysarch(ALPHA_SET_FPMASK, (char *) &p);
-	return ((fp_except) p.mask);
+	return ((fp_except_t) p.mask);
 }
diff --git a/lib/libc/alpha/gen/fpsetround.c b/lib/libc/alpha/gen/fpsetround.c
index 0d8f40af6d65..df924ddf1253 100644
--- a/lib/libc/alpha/gen/fpsetround.c
+++ b/lib/libc/alpha/gen/fpsetround.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: fpsetround.c,v 1.1 1995/04/29 05:09:57 cgd Exp $	*/
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou
@@ -35,9 +36,9 @@
 #include <ieeefp.h>
 #include <machine/fpu.h>
 
-fp_rnd
+fp_rnd_t
 fpsetround(rnd_dir)
-	fp_rnd rnd_dir;
+	fp_rnd_t rnd_dir;
 {
 	double fpcrval;
 	u_int64_t old, new;
diff --git a/lib/libc/alpha/gen/fpsetsticky.c b/lib/libc/alpha/gen/fpsetsticky.c
index ae0d742f79f0..60807c1bd9f3 100644
--- a/lib/libc/alpha/gen/fpsetsticky.c
+++ b/lib/libc/alpha/gen/fpsetsticky.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: fpsetsticky.c,v 1.1 1995/04/29 05:11:04 cgd Exp $	*/
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou
@@ -35,9 +36,9 @@
 #include <ieeefp.h>
 #include <machine/fpu.h>
 
-fp_except
+fp_except_t
 fpsetsticky(sticky)
-	fp_except sticky;
+	fp_except_t sticky;
 {
 	double fpcrval;
 	u_int64_t old,new ;
diff --git a/sys/alpha/include/ieeefp.h b/sys/alpha/include/ieeefp.h
index b357101c0cea..034c417feb3f 100644
--- a/sys/alpha/include/ieeefp.h
+++ b/sys/alpha/include/ieeefp.h
@@ -24,6 +24,6 @@ typedef enum {
     FP_RM=1,			/* round toward negative infinity */
     FP_RN=2,			/* round to nearest representable number */
     FP_RP=3			/* round toward positive infinity */
-} fp_rnd;
+} fp_rnd_t;
 
 #endif /* _ALPHA_IEEEFP_H_ */