[src/trunk]: src/sys/arch From: Tobias Ulmer. Unbreak zfs module build on spa...

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

details:   https://anonhg.NetBSD.org/src/rev/537b50d23e1b
branches:  trunk
changeset: 451328:537b50d23e1b
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 15 16:59:10 2019 +0000

description:
From: Tobias Ulmer. Unbreak zfs module build on sparc{,64} by hiding DELAY.
ZFS has a conflicting definition of delay() and tries to hide it by
defining __HIDE_DELAY.

diffstat:

 sys/arch/sparc/include/param.h   |  6 +++++-
 sys/arch/sparc64/include/param.h |  4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r 570e7e01d453 -r 537b50d23e1b sys/arch/sparc/include/param.h
--- a/sys/arch/sparc/include/param.h    Wed May 15 13:49:10 2019 +0000
+++ b/sys/arch/sparc/include/param.h    Wed May 15 16:59:10 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.72 2019/01/07 22:00:32 jdolecek Exp $ */
+/*     $NetBSD: param.h,v 1.73 2019/05/15 16:59:10 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -112,8 +112,12 @@
 
 #if defined(_KERNEL) || defined(_STANDALONE)
 #ifndef _LOCORE
+
+#ifndef __HIDE_DELAY
 extern void    delay(unsigned int);
 #define        DELAY(n)        delay(n)
+#endif /* __HIDE_DELAY */
+
 #endif /* _LOCORE */
 
 /*
diff -r 570e7e01d453 -r 537b50d23e1b sys/arch/sparc64/include/param.h
--- a/sys/arch/sparc64/include/param.h  Wed May 15 13:49:10 2019 +0000
+++ b/sys/arch/sparc64/include/param.h  Wed May 15 16:59:10 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.59 2019/01/07 22:00:32 jdolecek Exp $ */
+/*     $NetBSD: param.h,v 1.60 2019/05/15 16:59:10 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -224,8 +224,10 @@
 #ifdef _KERNEL
 #ifndef _LOCORE
 
+#ifndef __HIDE_DELAY
 extern void    delay(unsigned int);
 #define        DELAY(n)        delay(n)
+#endif /* __HIDE_DELAY */
 
 #ifdef __arch64__
 /* If we're using a 64-bit kernel use 64-bit math */