From owner-freebsd-current@FreeBSD.ORG  Tue Apr  3 13:06:11 2012
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7D287106564A
	for <freebsd-current@freebsd.org>; Tue,  3 Apr 2012 13:06:11 +0000 (UTC)
	(envelope-from eric@vangyzen.net)
Received: from aussmtpmrkpc120.us.dell.com (aussmtpmrkpc120.us.dell.com
	[143.166.82.159])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C46C8FC0A
	for <freebsd-current@freebsd.org>; Tue,  3 Apr 2012 13:06:11 +0000 (UTC)
X-Loopcount0: from 64.238.244.148
X-IronPort-AV: E=Sophos;i="4.75,363,1330927200"; d="scan'208";a="498120813"
Received: from mail.compellent.com ([64.238.244.148])
	by aussmtpmrkpc120.us.dell.com with ESMTP; 03 Apr 2012 08:06:05 -0500
Message-ID: <4F7AF5BD.6060409@vangyzen.net>
Date: Tue, 3 Apr 2012 08:06:05 -0500
From: Eric van Gyzen <eric@vangyzen.net>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:6.0) Gecko/20110816 Thunderbird/6.0
MIME-Version: 1.0
To: Rudy <crapsh@monkeybrains.net>
References: <4F7A1913.8040005@monkeybrains.net>
In-Reply-To: <4F7A1913.8040005@monkeybrains.net>
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit
Cc: freebsd-current@freebsd.org
Subject: Re: ixgbe-2.4.4 compile error
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Tue, 03 Apr 2012 13:06:11 -0000

On 04/02/2012 16:24, Rudy wrote:
>
> I used the 9.0-RELEASE memstick to install, did a cvsup to STABLE...
>
> When I downloaded Intel's (Jack's) ixgbe driver, I got an error:
>
> ixgbe_osdep.h:104: error: conflicting types for 'bool'
> @/sys/types.h:271: error: previous declaration of 'bool' was here
>
>
> This patch fixed the 'conflict'.
>  > diff -u @/sys/types.h.orig @/sys/types.h
> --- @/sys/types.h.orig 2012-04-02 14:18:26.000000000 -0700
> +++ @/sys/types.h 2012-04-02 14:20:19.000000000 -0700
> @@ -268,7 +268,7 @@
> #if __STDC_VERSION__ < 199901L && __GNUC__ < 3 &&
> !defined(__INTEL_COMPILER)
> typedef int _Bool;
> #endif
> -typedef _Bool bool;
> +// typedef _Bool bool;
> #endif /* !__bool_true_false_are_defined && !__cplusplus */

Perhaps a more appropriate change would be in ixgbe_osdep.h:

+#ifndef bool
  typedef boolean_t	bool;
+#endif

This would change the size of the bool type as used in the ixgbe driver, 
but after a quick glance through the code, I don't think that would 
cause any trouble.  Try it; if it passes traffic, it's probably correct.

Eric