Module Name: src
Committed By: christos
Date: Sat Jun 2 18:46:34 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: proc.h systm.h time.h
Log Message:
- Remove more extraneous includes to avoid circular dependencies with the
real header files.
- Add <sys/errno.h> to <sys/systm.h> to avoid changing the source, but
it should really belong to the source.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/proc.h
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/systm.h
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/sys/sys/time.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/proc.h
diff -u src/external/cddl/osnet/sys/sys/proc.h:1.6 src/external/cddl/osnet/sys/sys/proc.h:1.7
--- src/external/cddl/osnet/sys/sys/proc.h:1.6 Mon May 28 17:05:10 2018
+++ src/external/cddl/osnet/sys/sys/proc.h Sat Jun 2 14:46:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.6 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: proc.h,v 1.7 2018/06/02 18:46:34 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -60,7 +60,6 @@
#ifndef _OPENSOLARIS_SYS_PROC_H_
#define _OPENSOLARIS_SYS_PROC_H_
-#include <sys/param.h>
#include_next <sys/proc.h>
#include <sys/stdint.h>
Index: src/external/cddl/osnet/sys/sys/systm.h
diff -u src/external/cddl/osnet/sys/sys/systm.h:1.5 src/external/cddl/osnet/sys/sys/systm.h:1.6
--- src/external/cddl/osnet/sys/sys/systm.h:1.5 Mon May 28 17:05:10 2018
+++ src/external/cddl/osnet/sys/sys/systm.h Sat Jun 2 14:46:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.5 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: systm.h,v 1.6 2018/06/02 18:46:34 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -57,8 +57,6 @@
* $FreeBSD: head/sys/cddl/compat/opensolaris/sys/systm.h 296510 2016-03-08 17:27:13Z mav $
*/
-#include <sys/proc.h>
-
#ifndef _OPENSOLARIS_SYS_SYSTM_H_
#define _OPENSOLARIS_SYS_SYSTM_H_
@@ -67,10 +65,9 @@
#include_next <sys/systm.h>
#endif
-#include <sys/param.h>
-
#ifdef _KERNEL
#include <sys/string.h>
+#include <sys/errno.h>
#define PAGESIZE PAGE_SIZE
#define PAGEOFFSET (PAGESIZE - 1)
Index: src/external/cddl/osnet/sys/sys/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.10 src/external/cddl/osnet/sys/sys/time.h:1.11
--- src/external/cddl/osnet/sys/sys/time.h:1.10 Thu May 31 20:56:19 2018
+++ src/external/cddl/osnet/sys/sys/time.h Sat Jun 2 14:46:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.10 2018/06/01 00:56:19 kre Exp $ */
+/* $NetBSD: time.h,v 1.11 2018/06/02 18:46:34 christos Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek <[email protected]>
@@ -62,7 +62,6 @@ typedef longlong_t hrtime_t;
#define NSEC_TO_TICK(nsec) ((nsec) / (NANOSEC / hz))
#ifdef _KERNEL
-#include <sys/systm.h>
static __inline hrtime_t
gethrtime(void) {
