From owner-freebsd-current@FreeBSD.ORG  Sat Jun  7 11:13:36 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8DEAD37B401
	for <current@freebsd.org>; Sat,  7 Jun 2003 11:13:36 -0700 (PDT)
Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E532E43F93
	for <current@freebsd.org>; Sat,  7 Jun 2003 11:13:35 -0700 (PDT)
	(envelope-from obrien@NUXI.com)
Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1])
	by dragon.nuxi.com (8.12.9/8.12.9) with ESMTP id h57IDJVm070929;
	Sat, 7 Jun 2003 11:13:19 -0700 (PDT)
	(envelope-from obrien@dragon.nuxi.com)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.12.9/8.12.9/Submit) id h57IDF4Y070928;
	Sat, 7 Jun 2003 11:13:15 -0700 (PDT)
Date: Sat, 7 Jun 2003 11:13:15 -0700
From: "David O'Brien" <obrien@freebsd.org>
To: Tim Kientzle <kientzle@acm.org>
Message-ID: <20030607181315.GF70196@dragon.nuxi.com>
Mail-Followup-To: David O'Brien <obrien@FreeBSD.org>,
	Tim Kientzle <kientzle@acm.org>, current@freebsd.org
References: <200306070438.h574cs52049913@cueball.rtp.FreeBSD.org>
	<3EE16E0F.2050207@acm.org> <20030607065700.GA59525@dragon.nuxi.com>
	<3EE22307.7020100@acm.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <3EE22307.7020100@acm.org>
User-Agent: Mutt/1.4i
X-Operating-System: FreeBSD 5.1-BETA
Organization: The NUXI BSD Group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
cc: current@freebsd.org
Subject: Re: Can't build -CURRENT on 4.7
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: obrien@freebsd.org
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jun 2003 18:13:36 -0000

On Sat, Jun 07, 2003 at 10:38:15AM -0700, Tim Kientzle wrote:
> Index: usr.bin/xlint/lint1/cgram.y
> ===================================================================
> RCS file: /usr/src/cvs/src/usr.bin/xlint/lint1/cgram.y,v
> retrieving revision 1.7
> diff -u -r1.7 cgram.y
> --- usr.bin/xlint/lint1/cgram.y	3 Mar 2002 15:12:19 -0000	1.7
> +++ usr.bin/xlint/lint1/cgram.y	7 Jun 2003 06:30:12 -0000
> @@ -1642,17 +1642,17 @@
> -static inline int uq_gt(uint64_t, uint64_t);
> -static inline int q_gt(int64_t, int64_t);
> +static __inline int uq_gt(uint64_t, uint64_t);
> +static __inline int q_gt(int64_t, int64_t);
>  
> -static inline int
> +static __inline int
>  uq_gt(uint64_t a, uint64_t b)
>  {
>  
>  	return (a > b);
>  }
>  
> -static inline int
> +static __inline int

Good catch!  The rest of the file used __include everywhere.  I've fixed
the inconsistency.