From d32bd396f2cf27ea5252b619a5187122e067aa0a Mon Sep 17 00:00:00 2001 From: jdolecek Date: Thu, 10 Oct 2002 10:51:56 +0000 Subject: [PATCH] #undef ffs before the ffs() function definition, so that the name isn't rewrote to __builtin_ffs() on gcc 2.95+; this fixes compilation on sun2 also change the comment for function --- sys/lib/libkern/ffs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/lib/libkern/ffs.c b/sys/lib/libkern/ffs.c index 256d46e44f87..6629f8faffde 100644 --- a/sys/lib/libkern/ffs.c +++ b/sys/lib/libkern/ffs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ffs.c,v 1.8 1998/03/27 01:30:01 cgd Exp $ */ +/* $NetBSD: ffs.c,v 1.9 2002/10/10 10:51:56 jdolecek Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)ffs.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: ffs.c,v 1.8 1998/03/27 01:30:01 cgd Exp $"); +__RCSID("$NetBSD: ffs.c,v 1.9 2002/10/10 10:51:56 jdolecek Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -48,8 +48,11 @@ __RCSID("$NetBSD: ffs.c,v 1.8 1998/03/27 01:30:01 cgd Exp $"); #include #endif +/* #undef ffs() - might be defined as macro to __builtin_ffs() */ +#undef ffs + /* - * ffs -- vax ffs instruction + * ffs - find first bit set in a bit string (C version) */ int ffs(mask)