From 6bef4df57c1eda81ac1a2c19e75c9518294f27c2 Mon Sep 17 00:00:00 2001
From: Andrew Moore <alm@FreeBSD.org>
Date: Fri, 27 Aug 1993 05:09:38 +0000
Subject: [PATCH] prefixed inline functions' parameter names with _ and
 declared the return type explicitly.

---
 sys/amd64/include/floatingpoint.h | 32 +++++++++++++++----------------
 sys/i386/include/floatingpoint.h  | 32 +++++++++++++++----------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index bc69d2e975d..6e2ebec7797 100644
--- a/sys/amd64/include/floatingpoint.h
+++ b/sys/amd64/include/floatingpoint.h
@@ -55,36 +55,36 @@
 /*
  * return the contents of a FP register
  */
-static __inline__
-__fpgetreg(reg)
+static __inline__ int
+__fpgetreg(int _reg)
 {
-	unsigned short mem;
+	unsigned short _mem;
 
-	switch(reg) {
+	switch(_reg) {
 	default:
-		fnstcw(&mem);
+		fnstcw(&_mem);
 		break;
 	case FP_STKY_REG:
-		fnstsw(&mem);
+		fnstsw(&_mem);
 		break;
 	}
-	return mem;
+	return _mem;
 }
 
 /*
  * set a FP mode; return previous mode
  */
-static __inline__
-__fpsetreg(m, reg, fld, off)
+static __inline__ int
+__fpsetreg(int _m, int _reg, int _fld, int _off)
 {
-	unsigned env[7];
-	unsigned p;
+	unsigned _env[7];
+	unsigned _p;
 
-	fnstenv(env);
-	p =  (env[reg] & fld) >> off;
-	env[reg] = (env[reg] & ~fld) | (m << off & fld);
-	fldenv(env);
-	return p;
+	fnstenv(_env);
+	_p =  (_env[_reg] & _fld) >> _off;
+	_env[_reg] = (_env[_reg] & ~_fld) | (_m << _off & _fld);
+	fldenv(_env);
+	return _p;
 }
 
 #endif /* __i386__ */
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index bc69d2e975d..6e2ebec7797 100644
--- a/sys/i386/include/floatingpoint.h
+++ b/sys/i386/include/floatingpoint.h
@@ -55,36 +55,36 @@
 /*
  * return the contents of a FP register
  */
-static __inline__
-__fpgetreg(reg)
+static __inline__ int
+__fpgetreg(int _reg)
 {
-	unsigned short mem;
+	unsigned short _mem;
 
-	switch(reg) {
+	switch(_reg) {
 	default:
-		fnstcw(&mem);
+		fnstcw(&_mem);
 		break;
 	case FP_STKY_REG:
-		fnstsw(&mem);
+		fnstsw(&_mem);
 		break;
 	}
-	return mem;
+	return _mem;
 }
 
 /*
  * set a FP mode; return previous mode
  */
-static __inline__
-__fpsetreg(m, reg, fld, off)
+static __inline__ int
+__fpsetreg(int _m, int _reg, int _fld, int _off)
 {
-	unsigned env[7];
-	unsigned p;
+	unsigned _env[7];
+	unsigned _p;
 
-	fnstenv(env);
-	p =  (env[reg] & fld) >> off;
-	env[reg] = (env[reg] & ~fld) | (m << off & fld);
-	fldenv(env);
-	return p;
+	fnstenv(_env);
+	_p =  (_env[_reg] & _fld) >> _off;
+	_env[_reg] = (_env[_reg] & ~_fld) | (_m << _off & _fld);
+	fldenv(_env);
+	return _p;
 }
 
 #endif /* __i386__ */