From a851a9f7138b911f7a3767eb22c27129fbb91f71 Mon Sep 17 00:00:00 2001 From: bde Date: Tue, 3 Feb 1998 20:14:35 +0000 Subject: Changed `inline' to `__inline' so that this file can be compiled by `gcc -ansi'. Changed NULL to 0 so that this file is more self-sufficient (now only is a prerequisite). --- sys/compat/netbsd/dvcfg.h | 6 +++--- sys/i386/include/dvcfg.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/compat/netbsd/dvcfg.h b/sys/compat/netbsd/dvcfg.h index f092117..0ac75d9 100644 --- a/sys/compat/netbsd/dvcfg.h +++ b/sys/compat/netbsd/dvcfg.h @@ -49,15 +49,15 @@ struct dvcfg_hwsel { #define DVCFG_HWSEL_SZ(array) (sizeof(array) / sizeof(dvcfg_hw_t)) -static inline dvcfg_hw_t dvcfg_hw __P((struct dvcfg_hwsel *, u_int)); +static __inline dvcfg_hw_t dvcfg_hw __P((struct dvcfg_hwsel *, u_int)); -static inline dvcfg_hw_t +static __inline dvcfg_hw_t dvcfg_hw(selp, num) struct dvcfg_hwsel *selp; u_int num; { - return ((num >= selp->cfg_max) ? NULL : selp->cfg_sel[num]); + return ((num >= selp->cfg_max) ? 0 : selp->cfg_sel[num]); } #define DVCFG_HW(SELP, NUM) dvcfg_hw((SELP), (NUM)) diff --git a/sys/i386/include/dvcfg.h b/sys/i386/include/dvcfg.h index f092117..0ac75d9 100644 --- a/sys/i386/include/dvcfg.h +++ b/sys/i386/include/dvcfg.h @@ -49,15 +49,15 @@ struct dvcfg_hwsel { #define DVCFG_HWSEL_SZ(array) (sizeof(array) / sizeof(dvcfg_hw_t)) -static inline dvcfg_hw_t dvcfg_hw __P((struct dvcfg_hwsel *, u_int)); +static __inline dvcfg_hw_t dvcfg_hw __P((struct dvcfg_hwsel *, u_int)); -static inline dvcfg_hw_t +static __inline dvcfg_hw_t dvcfg_hw(selp, num) struct dvcfg_hwsel *selp; u_int num; { - return ((num >= selp->cfg_max) ? NULL : selp->cfg_sel[num]); + return ((num >= selp->cfg_max) ? 0 : selp->cfg_sel[num]); } #define DVCFG_HW(SELP, NUM) dvcfg_hw((SELP), (NUM)) -- cgit v1.1