Re: egcs-CVS19980928, some more CHILL warning patches

[Dave Brolley <brolley at cygnus dot com>]

Kaveh R. Ghazi wrote:

>          Okay, expand_expr() is prototyped correctly in expr.h.  The
> expr.h header needs rtl.h.  If I include rtl.h & expr.h in parse.c, I
> get the following conflicts:
>
>  > In file included from ../rtl.h:41,
>  >                  from parse.c:52:
>  > ../rtl.def:483: conflicting types for `SET'
>  > parse.h:38: previous declaration of `SET'
>  > ../rtl.def:499: conflicting types for `CALL'
>  > parse.h:20: previous declaration of `CALL'
>  > ../rtl.def:503: conflicting types for `RETURN'
>  > parse.h:37: previous declaration of `RETURN'
>  > [...]
>  > ../rtl.def:733: conflicting types for `LT'
>  > parse.h:30: previous declaration of `LT'
>  > parse.c:76: conflicting types for `emit_label'
>  > ../rtl.h:911: previous declaration of `emit_label'
>
>         The tokens in parse.h are from `enum terminal'.  Rtl.def sets
> the same tokens in DEF_RTL_EXPR() macros.
>
>         I think the conflict with function `emit_label' is simply a
> thinko in the prototype's return-type in parse.c.  Easily fixed.
>
>         I am open to suggestions on the token declaration though.

My suggestion is to rename the conflicting tokens in parse.h

Dave