Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
christos 2019-05-15 16:59:10 +00:00
parent 6517494e91
commit 58c984f9c2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/sparc/include/param.h
View File

@ -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 * Copyright (c) 1992, 1993
@ -112,8 +112,12 @@ extern int nbpg, pgofset, pgshift;
#if defined(_KERNEL) || defined(_STANDALONE) #if defined(_KERNEL) || defined(_STANDALONE)
#ifndef _LOCORE #ifndef _LOCORE
#ifndef __HIDE_DELAY
extern void delay(unsigned int); extern void delay(unsigned int);
#define DELAY(n) delay(n) #define DELAY(n) delay(n)
#endif /* __HIDE_DELAY */
#endif /* _LOCORE */ #endif /* _LOCORE */
/* /*

4
sys/arch/sparc64/include/param.h
View File

@ -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 * Copyright (c) 1992, 1993
@ -224,8 +224,10 @@ extern int nbpg, pgofset, pgshift;
#ifdef _KERNEL #ifdef _KERNEL
#ifndef _LOCORE #ifndef _LOCORE
#ifndef __HIDE_DELAY
extern void delay(unsigned int); extern void delay(unsigned int);
#define DELAY(n) delay(n) #define DELAY(n) delay(n)
#endif /* __HIDE_DELAY */
#ifdef __arch64__ #ifdef __arch64__
/* If we're using a 64-bit kernel use 64-bit math */ /* If we're using a 64-bit kernel use 64-bit math */