Author: mav
Date: Sun Jan 5 19:07:42 2014
New Revision: 260328
URL: http://svnweb.freebsd.org/changeset/base/260328
Log:
Fix build after r260234 by converting ddi_get_lbolt64() from inline into
a macro. Otherwise compiler complains that hz variable used there either
undefined or defined twice, thanks to header mess caused by compat shims.
Modified:
head/sys/cddl/compat/opensolaris/sys/time.h
Modified: head/sys/cddl/compat/opensolaris/sys/time.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/time.h Sun Jan 5 18:46:58 2014
(r260327)
+++ head/sys/cddl/compat/opensolaris/sys/time.h Sun Jan 5 19:07:42 2014
(r260328)
@@ -70,21 +70,10 @@ gethrtime(void) {
#define gethrtime_waitfree() gethrtime()
extern int nsec_per_tick; /* nanoseconds per clock tick */
-extern int hz; /* clock ticks per second */
-static __inline int64_t
-ddi_get_lbolt64(void)
-{
-
- return (((getsbinuptime() >> 16) * hz) >> 16);
-}
-
-static __inline clock_t
-ddi_get_lbolt(void)
-{
-
- return (ddi_get_lbolt64());
-}
+#define ddi_get_lbolt64() \
+ (int64_t)(((getsbinuptime() >> 16) * hz) >> 16)
+#define ddi_get_lbolt() (clock_t)ddi_get_lbolt64()
#else
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
