svn commit: r251855 - head/sys/sys

[David Chisnall]

Author: theraven
Date: Mon Jun 17 15:30:47 2013
New Revision: 251855
URL: http://svnweb.freebsd.org/changeset/base/251855

Log:
  Rename a parameter in sys/time.h so that you don't get warnings for things
  like libdialog that include both this header and math.h.

Modified:
  head/sys/sys/time.h

Modified: head/sys/sys/time.h
==============================================================================
--- head/sys/sys/time.h	Mon Jun 17 15:16:14 2013	(r251854)
+++ head/sys/sys/time.h	Mon Jun 17 15:30:47 2013	(r251855)
@@ -103,17 +103,17 @@ bintime_mul(struct bintime *bt, u_int x)
 }
 
 static __inline void
-bintime_shift(struct bintime *bt, int exp)
+bintime_shift(struct bintime *__bt, int __exp)
 {
 
-	if (exp > 0) {
-		bt->sec <<= exp;
-		bt->sec |= bt->frac >> (64 - exp);
-		bt->frac <<= exp;
-	} else if (exp < 0) {
-		bt->frac >>= -exp;
-		bt->frac |= (uint64_t)bt->sec << (64 + exp);
-		bt->sec >>= -exp;
+	if (__exp > 0) {
+		__bt->sec <<= __exp;
+		__bt->sec |= __bt->frac >> (64 - __exp);
+		__bt->frac <<= __exp;
+	} else if (__exp < 0) {
+		__bt->frac >>= -__exp;
+		__bt->frac |= (uint64_t)__bt->sec << (64 + __exp);
+		__bt->sec >>= -__exp;
 	}
 }