[src/trunk]: src/external/cddl/osnet/dist/uts/common/sys Omit conflicting def...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/feaa6394fe28
branches:  trunk
changeset: 836979:feaa6394fe28
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Nov 15 04:55:17 2018 +0000

description:
Omit conflicting definition that breaks build on aarch64.

diffstat:

 external/cddl/osnet/dist/uts/common/sys/dtrace.h |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (14 lines):

diff -r 2cc3961f593d -r feaa6394fe28 external/cddl/osnet/dist/uts/common/sys/dtrace.h
--- a/external/cddl/osnet/dist/uts/common/sys/dtrace.h  Thu Nov 15 04:55:06 2018 +0000
+++ b/external/cddl/osnet/dist/uts/common/sys/dtrace.h  Thu Nov 15 04:55:17 2018 +0000
@@ -2483,7 +2483,10 @@
 #define        ARG2_MASK       0x1f
 #define        OFFSET_SHIFT    15
 #define        OFFSET_SIZE     7
+#if 0
+/* conflicts with lzjb.c */
 #define        OFFSET_MASK     ((1 << OFFSET_SIZE) - 1)
+#endif
 
 #define        DTRACE_INVOP_PUSHM      1
 #define        DTRACE_INVOP_RET        2