From owner-freebsd-current Wed Apr 25 16:59:20 2001 Delivered-To: freebsd-current@freebsd.org Received: from localhost.pointone.com (hst33-140.ltcable.com [64.132.33.140]) by hub.freebsd.org (Postfix) with ESMTP id C978D37B424 for ; Wed, 25 Apr 2001 16:59:09 -0700 (PDT) (envelope-from nrigney@point-one.net) Received: (from nrigney@localhost) by localhost.pointone.com (8.11.3/8.10.0) id f3MBxqm00974; Sun, 22 Apr 2001 11:59:52 GMT Date: Sun, 22 Apr 2001 11:59:47 +0000 From: Neal Rigney To: Michael Harnois Cc: freebsd-current@freebsd.org Subject: Re: world broken at vnode.h Message-ID: <20010422115947.A920@pointone.com> Mail-Followup-To: Neal Rigney , Michael Harnois , freebsd-current@freebsd.org References: <86itjwhph1.fsf@mharnois.workgroup.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <86itjwhph1.fsf@mharnois.workgroup.net>; from mdharnois@home.com on Sun, Apr 22, 2001 at 11:24:42AM -0500 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Sun, Apr 22, 2001 at 11:24:42AM -0500, Michael Harnois wrote: > In file included from ../../dev/bktr/bktr_audio.c:52: > ../../sys/vnode.h:571: conflicting types for `vaccess_acl_posix1e' > ../../sys/vnode.h:568: previous declaration of `vaccess_acl_posix1e' > ../../sys/vnode.h:571: warning: redundant redeclaration of `vaccess_acl_posix1e' in same scope > ../../sys/vnode.h:568: warning: previous declaration of `vaccess_acl_posix1e' > *** Error code 1 > > the offending lines in vnode.h are > > int vaccess_acl_posix1e __P((enum vtype type, struct acl *acl, > mode_t acc_mode, struct ucred *cred, int *privused)); > int vaccess_acl_posix1e __P((enum vtype type, uid_t file_uid, > gid_t file_gid, struct acl *acl, mode_t acc_mode, > struct ucred *cred, int *privused)); > > One suspects only one of those can be correct ... > It appears so. I removed the first line and everything compiled fine. I'm not testing huge amounts of code, so YMMV: *** vnode.h Sun Apr 22 10:42:29 2001 --- vnode.h.old Sun Apr 22 10:39:18 2001 *************** *** 564,569 **** --- 564,571 ---- char **retfreebuf)); int vaccess __P((enum vtype type, mode_t file_mode, uid_t uid, gid_t gid, mode_t acc_mode, struct ucred *cred, int *privused)); + int vaccess_acl_posix1e __P((enum vtype type, struct acl *acl, + mode_t acc_mode, struct ucred *cred, int *privused)); int vaccess_acl_posix1e __P((enum vtype type, uid_t file_uid, gid_t file_gid, struct acl *acl, mode_t acc_mode, struct ucred *cred, int *privused)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message