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 ...

Alexander Leidinger Alexander at Leidinger.net
Sat Mar 13 02:03:48 PST 2004


On Sat, 13 Mar 2004 00:33:15 +0200
Ruslan Ermilov <ru at 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


More information about the cvs-src mailing list