From owner-svn-src-all@FreeBSD.ORG  Mon Jun 17 15:30:48 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 38C5144C;
 Mon, 17 Jun 2013 15:30:48 +0000 (UTC)
 (envelope-from theraven@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2B73F1DFC;
 Mon, 17 Jun 2013 15:30:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HFUmwt035190;
 Mon, 17 Jun 2013 15:30:48 GMT
 (envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5HFUmx5035189;
 Mon, 17 Jun 2013 15:30:48 GMT
 (envelope-from theraven@svn.freebsd.org)
Message-Id: <201306171530.r5HFUmx5035189@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Mon, 17 Jun 2013 15:30:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251855 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 17 Jun 2013 15:30:48 -0000

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;
 	}
 }