Module Name: src
Committed By: chs
Date: Sun Jun 3 05:55:08 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: proc.h sysmacros.h time.h types.h
Log Message:
tweak the osnet compat headers to allow building on MacOS and Linux hosts.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/proc.h
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/sysmacros.h
cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/sys/sys/time.h
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/sys/sys/types.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.7 src/external/cddl/osnet/sys/sys/proc.h:1.8
--- src/external/cddl/osnet/sys/sys/proc.h:1.7 Sat Jun 2 18:46:34 2018
+++ src/external/cddl/osnet/sys/sys/proc.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.7 2018/06/02 18:46:34 christos Exp $ */
+/* $NetBSD: proc.h,v 1.8 2018/06/03 05:55:08 chs Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,9 @@
#define _OPENSOLARIS_SYS_PROC_H_
#include_next <sys/proc.h>
+#ifdef __NetBSD__
#include <sys/stdint.h>
+#endif
#ifdef _KERNEL
Index: src/external/cddl/osnet/sys/sys/sysmacros.h
diff -u src/external/cddl/osnet/sys/sys/sysmacros.h:1.8 src/external/cddl/osnet/sys/sys/sysmacros.h:1.9
--- src/external/cddl/osnet/sys/sys/sysmacros.h:1.8 Mon May 28 21:05:10 2018
+++ src/external/cddl/osnet/sys/sys/sysmacros.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmacros.h,v 1.8 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: sysmacros.h,v 1.9 2018/06/03 05:55:08 chs Exp $ */
/*
* CDDL HEADER START
@@ -32,6 +32,16 @@
#ifndef _SYS_SYSMACROS_H
#define _SYS_SYSMACROS_H
+/*
+ * Linux includes <sys/sysmacros.h> from <sys/types.h> with
+ * __SYSMACROS_DEPRECATED_INCLUSION defined during the include,
+ * but some of the definitions here break in that context,
+ * so if that symbol is defined then only define the few macros
+ * that we need there.
+ */
+
+#ifndef __SYSMACROS_DEPRECATED_INCLUSION
+
#include <sys/param.h>
#include <sys/opentypes.h>
@@ -52,6 +62,8 @@ extern "C" {
#define btodt(BB) ((BB) >> DEV_BSHIFT)
#define lbtod(BB) (((offset_t)(BB) + DEV_BSIZE - 1) >> DEV_BSHIFT)
+#endif /* __SYSMACROS_DEPRECATED_INCLUSION */
+
/* common macros */
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -66,6 +78,8 @@ extern "C" {
#define SIGNOF(a) ((a) < 0 ? -1 : (a) > 0)
#endif
+#ifndef __SYSMACROS_DEPRECATED_INCLUSION
+
#ifdef _KERNEL
/*
@@ -469,4 +483,6 @@ highbit64(uint64_t i)
}
#endif
+#endif /* __SYSMACROS_DEPRECATED_INCLUSION */
+
#endif /* _SYS_SYSMACROS_H */
Index: src/external/cddl/osnet/sys/sys/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.11 src/external/cddl/osnet/sys/sys/time.h:1.12
--- src/external/cddl/osnet/sys/sys/time.h:1.11 Sat Jun 2 18:46:34 2018
+++ src/external/cddl/osnet/sys/sys/time.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.11 2018/06/02 18:46:34 christos Exp $ */
+/* $NetBSD: time.h,v 1.12 2018/06/03 05:55:08 chs Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek <p...@freebsd.org>
@@ -92,8 +92,13 @@ ddi_get_lbolt64(void)
#else
+#ifdef __NetBSD__
int clock_gettime(clockid_t, struct timespec *)
__RENAME(__clock_gettime50);
+#endif
+#ifdef __linux__
+#include <time.h>
+#endif
static __inline hrtime_t gethrtime(void) {
struct timespec ts;
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.19 src/external/cddl/osnet/sys/sys/types.h:1.20
--- src/external/cddl/osnet/sys/sys/types.h:1.19 Fri Jun 1 00:56:19 2018
+++ src/external/cddl/osnet/sys/sys/types.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.19 2018/06/01 00:56:19 kre Exp $ */
+/* $NetBSD: types.h,v 1.20 2018/06/03 05:55:08 chs Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -65,11 +65,13 @@
*/
#define longlong_t __hide_longlong_t
#define u_longlong_t __hide_u_longlong_t
+
#ifndef _KERNEL
#include <stdint.h>
#else
#include <sys/stdint.h>
#endif
+
#ifndef HAVE_NBTOOLS_CONFIG_H
#ifdef _NETBSD_SOURCE
#include_next <sys/types.h>
@@ -81,6 +83,7 @@
#undef _NETBSD_SOURCE
#endif
#endif
+
#undef longlong_t
#undef u_longlong_t
#ifndef __defined_ll_t
