svn commit: r247477 - projects/calloutng/sys/sys

[Davide Italiano]

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