From owner-cvs-all@FreeBSD.ORG  Sat Mar 13 02:03:47 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id CF25B16A4CE; Sat, 13 Mar 2004 02:03:47 -0800 (PST)
Received: from mailout07.sul.t-online.com (mailout07.sul.t-online.com
	[194.25.134.83])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6927F43D41; Sat, 13 Mar 2004 02:03:47 -0800 (PST)
	(envelope-from Alexander@Leidinger.net)
Received: from fwd09.aul.t-online.de 
	by mailout07.sul.t-online.com with smtp 
	id 1B25ze-00045e-03; Sat, 13 Mar 2004 11:03:46 +0100
Received: from Andro-Beta.Leidinger.net
	(E1ZXB+ZV8eQ4BXg3-DOPU8KaIq1vmA1Z71iMR1t6oKzpXO7hkahkoT@[217.83.23.16]) by
	fmrl09.sul.t-online.com
	with esmtp id 1B25zY-1CrhYW0; Sat, 13 Mar 2004 11:03:40 +0100
Received: from Magellan.Leidinger.net (Magellan.Leidinger.net [192.168.1.1])
	i2DA3cEF029528;	Sat, 13 Mar 2004 11:03:38 +0100 (CET)
	(envelope-from Alexander@Leidinger.net)
Received: from Magellan.Leidinger.net (netchild@localhost [127.0.0.1])
	i2DA3cI2006243;	Sat, 13 Mar 2004 11:03:38 +0100 (CET)
	(envelope-from Alexander@Leidinger.net)
Date: Sat, 13 Mar 2004 11:03:38 +0100
From: Alexander Leidinger <Alexander@Leidinger.net>
To: cvs-all@freebsd.org
Message-Id: <20040313110338.5520b41c@Magellan.Leidinger.net>
In-Reply-To: <20040312223315.GE4588@ip.net.ua>
References: <20040312214545.7F3C216A4FA@hub.freebsd.org>
	<20040312223315.GE4588@ip.net.ua>
X-Mailer: Sylpheed version 0.9.9claws (GTK+ 1.2.10; i386-portbld-freebsd5.2)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Seen: false
X-ID: E1ZXB+ZV8eQ4BXg3-DOPU8KaIq1vmA1Z71iMR1t6oKzpXO7hkahkoT@t-dialin.net
cc: Tom Rhodes <trhodes@freebsd.org>
cc: src-committers@freebsd.org
cc: Ruslan Ermilov <ru@freebsd.org>
cc: cvs-src@freebsd.org
Subject: Re: cvs commit: src/sys/boot/arc/include arcfuncs.h
	src/sys/boot/i386/boot2 boot2.c src/sys/dev/aic7xxx/aicasm aicasm.c
	iir.h src/sys/dev/isp ispvar.h src/sys/dev/mcd	mcdreg.h ...
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Mar 2004 10:03:48 -0000

On Sat, 13 Mar 2004 00:33:15 +0200
Ruslan Ermilov <ru@freebsd.org> wrote:

> On Fri, Mar 12, 2004 at 01:45:45PM -0800, Tom Rhodes wrote:
> [...]
> > Index: src/sys/dev/mcd/mcdreg.h
> >  
> > -#ifdef __GNUC__
> > -#if __GNUC__ >= 2
> > +#if defined(__GNUC__) || defined(__INTEL_COMPILER)
> > +#if __GNUC__ >= 2 || defined(__INTEL_COMPILER)
> >  #pragma pack(1)
> >  #endif
> >  #endif
> >  
> > -#ifdef __GNUC__
> > -#if __GNUC__ >= 2
> > +#if defined(__GNUC__) || defined(__INTEL_COMPILER)
> > +#if __GNUC__ >= 2 || defined(__INTEL_COMPILER)
> >  #pragma pack(4)
> >  #endif
> >  #endif
> > 
> These ifdefs are broken.
> 
> #if (defined(__GNUC__) && __GNUC >= 2) || defined(__INTEL_COMPILER)
> 
> would be more correct.

I tried to produce a patch which doesn't changes existing style.

> > Index: src/sys/i386/include/in_cksum.h
> [...]
> > +#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
> > 
> I think these are mutually exclusive already, no?

As already explained by Marius and the commit log: no, icc may define
__GNUC__ in some cases.

Thanks for the review,
Alexander.

-- 
           I will be available to get hired in April 2004.

http://www.Leidinger.net                       Alexander @ Leidinger.net
  GPG fingerprint = C518 BC70 E67F 143F BE91  3365 79E2 9C60 B006 3FE7