[src/trunk]: src/external/cddl/osnet PR/51118: Jared McNeill: Fix build on Fr...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/cddl/osnet PR/51118: Jared McNeill: Fix build on Fr...
From: christos <christos%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 07:23:14 +0000
details:   https://anonhg.NetBSD.org/src/rev/93a3b1c6dcfe
branches:  trunk
changeset: 820368:93a3b1c6dcfe
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 07 21:39:52 2017 +0000

description:
PR/51118: Jared McNeill: Fix build on FreeBSD by removing osnet assert.h
and sys/limits.h and use sys/syslimits.h directly.

diffstat:

 external/cddl/osnet/dev/fbt/fbt.c                   |   4 +-
 external/cddl/osnet/dev/profile/profile.c           |   4 +-
 external/cddl/osnet/dev/sdt/sdt.c                   |   4 +-
 external/cddl/osnet/dev/systrace/systrace.c         |   4 +-
 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c |   2 +-
 external/cddl/osnet/sys/assert.h                    |  36 ---------------------
 external/cddl/osnet/sys/kern/taskq.c                |   4 +-
 external/cddl/osnet/sys/sys/limits.h                |  32 ------------------
 external/cddl/osnet/sys/sys/zfs_context.h           |   4 +-
 9 files changed, 13 insertions(+), 81 deletions(-)

diffs (199 lines):

diff -r e847725ca9a2 -r 93a3b1c6dcfe external/cddl/osnet/dev/fbt/fbt.c
--- a/external/cddl/osnet/dev/fbt/fbt.c Sat Jan 07 21:31:07 2017 +0000
+++ b/external/cddl/osnet/dev/fbt/fbt.c Sat Jan 07 21:39:52 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fbt.c,v 1.20 2016/09/16 03:10:45 pgoyette Exp $        */
+/*     $NetBSD: fbt.c,v 1.21 2017/01/07 21:39:52 christos Exp $        */
 
 /*
  * CDDL HEADER START
@@ -44,7 +44,7 @@
 #include <sys/ksyms.h>
 #include <sys/cpu.h>
 #include <sys/kthread.h>
-#include <sys/limits.h>
+#include <sys/syslimits.h>
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
diff -r e847725ca9a2 -r 93a3b1c6dcfe external/cddl/osnet/dev/profile/profile.c
--- a/external/cddl/osnet/dev/profile/profile.c Sat Jan 07 21:31:07 2017 +0000
+++ b/external/cddl/osnet/dev/profile/profile.c Sat Jan 07 21:39:52 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: profile.c,v 1.6 2016/04/09 15:17:58 riastradh Exp $    */
+/*     $NetBSD: profile.c,v 1.7 2017/01/07 21:39:52 christos Exp $     */
 
 /*
  * CDDL HEADER START
@@ -44,7 +44,7 @@
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
-#include <sys/limits.h>
+#include <sys/syslimits.h>
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
diff -r e847725ca9a2 -r 93a3b1c6dcfe external/cddl/osnet/dev/sdt/sdt.c
--- a/external/cddl/osnet/dev/sdt/sdt.c Sat Jan 07 21:31:07 2017 +0000
+++ b/external/cddl/osnet/dev/sdt/sdt.c Sat Jan 07 21:39:52 2017 +0000
@@ -39,7 +39,7 @@
  * unloaded; in particular, probes may not span multiple kernel modules.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.17 2016/07/17 02:09:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.18 2017/01/07 21:39:52 christos Exp $");
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
@@ -50,7 +50,7 @@
 #include <sys/eventhandler.h>
 #endif
 #include <sys/kernel.h>
-#include <sys/limits.h>
+#include <sys/syslimits.h>
 #ifdef __FreeBSD__
 #include <sys/linker.h>
 #include <sys/linker_set.h>
diff -r e847725ca9a2 -r 93a3b1c6dcfe external/cddl/osnet/dev/systrace/systrace.c
--- a/external/cddl/osnet/dev/systrace/systrace.c       Sat Jan 07 21:31:07 2017 +0000
+++ b/external/cddl/osnet/dev/systrace/systrace.c       Sat Jan 07 21:39:52 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: systrace.c,v 1.8 2015/09/24 14:26:44 christos Exp $    */
+/*     $NetBSD: systrace.c,v 1.9 2017/01/07 21:39:52 christos Exp $    */
 
 /*
  * CDDL HEADER START
@@ -41,7 +41,7 @@
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
-#include <sys/limits.h>
+#include <sys/syslimits.h>
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
diff -r e847725ca9a2 -r 93a3b1c6dcfe external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Sat Jan 07 21:31:07 2017 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Sat Jan 07 21:39:52 2017 +0000
@@ -119,7 +119,7 @@
 #if !defined(sun)
 
 #include <sys/ctype.h>
-#include <sys/limits.h>
+#include <sys/syslimits.h>
 //#include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
diff -r e847725ca9a2 -r 93a3b1c6dcfe external/cddl/osnet/sys/assert.h
--- a/external/cddl/osnet/sys/assert.h  Sat Jan 07 21:31:07 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*     $NetBSD: assert.h,v 1.2 2015/12/27 21:39:34 christos Exp $      */
-
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Doran.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include_next "assert.h"
-
-#ifndef __assert
-#define __assert(a, b, c)       __assert(a, c, b)
-#endif
diff -r e847725ca9a2 -r 93a3b1c6dcfe external/cddl/osnet/sys/kern/taskq.c
--- a/external/cddl/osnet/sys/kern/taskq.c      Sat Jan 07 21:31:07 2017 +0000
+++ b/external/cddl/osnet/sys/kern/taskq.c      Sat Jan 07 21:39:52 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: taskq.c,v 1.5 2015/04/11 16:32:07 riastradh Exp $      */
+/*     $NetBSD: taskq.c,v 1.6 2017/01/07 21:39:53 christos Exp $       */
 
 /*
  * CDDL HEADER START
@@ -385,7 +385,7 @@
 #include <sys/sdt.h>
 #include <sys/mutex.h>
 #include <sys/kernel.h>
-#include <sys/limits.h>
+#include <sys/syslimits.h>
 
 static kmem_cache_t *taskq_ent_cache, *taskq_cache;
 
diff -r e847725ca9a2 -r 93a3b1c6dcfe external/cddl/osnet/sys/sys/limits.h
--- a/external/cddl/osnet/sys/sys/limits.h      Sat Jan 07 21:31:07 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*     $NetBSD: limits.h,v 1.1 2009/08/07 20:57:57 haad Exp $  */
-
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Doran.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/syslimits.h>
diff -r e847725ca9a2 -r 93a3b1c6dcfe external/cddl/osnet/sys/sys/zfs_context.h
--- a/external/cddl/osnet/sys/sys/zfs_context.h Sat Jan 07 21:31:07 2017 +0000
+++ b/external/cddl/osnet/sys/sys/zfs_context.h Sat Jan 07 21:39:52 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zfs_context.h,v 1.16 2014/03/28 02:50:18 ozaki-r Exp $ */
+/*     $NetBSD: zfs_context.h,v 1.17 2017/01/07 21:39:53 christos Exp $        */
 
 /*
  * CDDL HEADER START
@@ -582,7 +582,7 @@
 
 #include <sys/systm.h>
 #include <sys/kcondvar.h>
-#include <sys/limits.h>
+#include <sys/syslimits.h>
 #include <sys/kmem.h>
 #include <sys/param.h>
 #include <sys/stdint.h>
Prev by Date: [src/trunk]: src/tools/compat regen
Next by Date: [src/trunk]: src/doc sqlite-3.16.2 out.
Previous by Thread: [src/trunk]: src/tools/compat regen
Next by Thread: [src/trunk]: src/doc sqlite-3.16.2 out.
Indexes:
Home | Main Index | Thread Index | Old Index