D33500.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33500.diff
View Options

	diff --git a/sys/sys/_callout.h b/sys/sys/_callout.h
	--- a/sys/sys/_callout.h
	+++ b/sys/sys/_callout.h
	@@ -40,6 +40,7 @@
	#ifndef _SYS__CALLOUT_H
	#define _SYS__CALLOUT_H

	+#include <sys/_types.h>
	#include <sys/queue.h>

	struct lock_object;
	@@ -56,8 +57,8 @@
	SLIST_ENTRY(callout) sle;
	TAILQ_ENTRY(callout) tqe;
	} c_links;
	- sbintime_t c_time; /* ticks to the event */
	- sbintime_t c_precision; /* delta allowed wrt opt */
	+ __sbintime_t c_time; /* ticks to the event */
	+ __sbintime_t c_precision; /* delta allowed wrt opt */
	void c_arg; / function argument */
	callout_func_t c_func; / function to call */
	struct lock_object c_lock; / lock to handle */
	diff --git a/sys/sys/_types.h b/sys/sys/_types.h
	--- a/sys/sys/_types.h
	+++ b/sys/sys/_types.h
	@@ -133,6 +133,7 @@
	typedef __int64_t __off_t; /* file offset */
	typedef __int64_t __off64_t; /* file offset (alias) */
	typedef __int32_t __pid_t; /* process [group] */
	+typedef __int64_t __sbintime_t;
	typedef __int64_t __rlim_t; /* resource limit - intentionally */
	/* signed, because of legacy code */
	/* that uses -1 for RLIM_INFINITY */
	diff --git a/sys/sys/types.h b/sys/sys/types.h
	--- a/sys/sys/types.h
	+++ b/sys/sys/types.h
	@@ -193,7 +193,7 @@
	#define _RLIM_T_DECLARED
	#endif

	-typedef __int64_t sbintime_t;
	+typedef __sbintime_t sbintime_t;

	typedef __segsz_t segsz_t; /* segment size (in pages) */