From owner-svn-src-projects@FreeBSD.ORG  Thu Feb 28 17:30:21 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 05518A61;
 Thu, 28 Feb 2013 17:30:21 +0000 (UTC)
 (envelope-from davide@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 E0EA53EC;
 Thu, 28 Feb 2013 17:30:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1SHUKsk080626;
 Thu, 28 Feb 2013 17:30:20 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1SHUK54080623;
 Thu, 28 Feb 2013 17:30:20 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201302281730.r1SHUK54080623@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Thu, 28 Feb 2013 17:30:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247477 - projects/calloutng/sys/sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Feb 2013 17:30:21 -0000

Author: davide
Date: Thu Feb 28 17:30:19 2013
New Revision: 247477
URL: http://svnweb.freebsd.org/changeset/base/247477

Log:
  Merge head r247464 through r247476 (with some minor modifications).

Modified:
  projects/calloutng/sys/sys/_callout.h
  projects/calloutng/sys/sys/time.h
  projects/calloutng/sys/sys/types.h

Modified: projects/calloutng/sys/sys/_callout.h
==============================================================================
--- projects/calloutng/sys/sys/_callout.h	Thu Feb 28 17:10:30 2013	(r247476)
+++ projects/calloutng/sys/sys/_callout.h	Thu Feb 28 17:30:19 2013	(r247477)
@@ -39,7 +39,6 @@
 #define	_SYS__CALLOUT_H
 
 #include <sys/queue.h>
-#include <sys/time.h>
 
 struct lock_object;
 

Modified: projects/calloutng/sys/sys/time.h
==============================================================================
--- projects/calloutng/sys/sys/time.h	Thu Feb 28 17:10:30 2013	(r247476)
+++ projects/calloutng/sys/sys/time.h	Thu Feb 28 17:30:19 2013	(r247477)
@@ -124,7 +124,6 @@ bintime_shift(struct bintime *bt, int ex
 	    ((a)->frac cmp (b)->frac) :					\
 	    ((a)->sec cmp (b)->sec))
 
-typedef int64_t sbintime_t;
 #define	SBT_1S	((sbintime_t)1 << 32)
 #define	SBT_1M	(SBT_1S * 60)
 #define	SBT_1MS	(SBT_1S / 1000)

Modified: projects/calloutng/sys/sys/types.h
==============================================================================
--- projects/calloutng/sys/sys/types.h	Thu Feb 28 17:10:30 2013	(r247476)
+++ projects/calloutng/sys/sys/types.h	Thu Feb 28 17:30:19 2013	(r247477)
@@ -188,6 +188,8 @@ typedef	__rlim_t	rlim_t;		/* resource li
 #define	_RLIM_T_DECLARED
 #endif
 
+typedef	__int64_t	sbintime_t;
+
 typedef	__segsz_t	segsz_t;	/* segment size (in pages) */
 
 #ifndef _SIZE_T_DECLARED