=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/lst.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- src/usr.bin/make/lst.h 2021/03/04 09:45:31 1.33 +++ src/usr.bin/make/lst.h 2023/09/05 14:05:41 1.34 @@ -1,7 +1,7 @@ #ifndef _LST_H_ #define _LST_H_ -/* $OpenBSD: lst.h,v 1.33 2021/03/04 09:45:31 espie Exp $ */ +/* $OpenBSD: lst.h,v 1.34 2023/09/05 14:05:41 jsg Exp $ */ /* $NetBSD: lst.h,v 1.7 1996/11/06 17:59:12 christos Exp $ */ /* @@ -159,25 +159,16 @@ #define Lst_Adv(ln) ((ln)->nextPtr) #define Lst_Rev(ln) ((ln)->prevPtr) - -/* Inlines are preferable to macros here because of the type checking. */ -#ifdef HAS_INLINES -static INLINE LstNode +static inline LstNode Lst_FindConst(Lst l, FindProcConst cProc, const void *d) { return Lst_FindFrom(Lst_First(l), (FindProc)cProc, (void *)d); } -static INLINE LstNode +static inline LstNode Lst_FindFromConst(LstNode ln, FindProcConst cProc, const void *d) { return Lst_FindFrom(ln, (FindProc)cProc, (void *)d); } -#else -#define Lst_FindConst(l, cProc, d) \ - Lst_FindFrom(Lst_First(l), (FindProc)cProc, (void *)d) -#define Lst_FindFromConst(ln, cProc, d) \ - Lst_FindFrom(ln, (FindProc)cProc, (void *)d) -#endif #endif /* _LST_H_ */