Build of egcs-971114 again fails with `C function `doublehypot(double, double)' conflicts with ...'

[Toon Moene <toon at moene dot indiv dot nluug dot nl>]

Hi,

I got the following error again (building egcs-971114 on  
m68k-next-nextstep3):

/Users/toon/Unix/compilers/egcs-971114/gcc/xgcc  
-B/Users/toon/Unix/compilers/egcs-971114/gcc/ -c -g -O2  
-fno-implicit-templates -I. -I./stl -I../libio -I./../libio  
-nostdinc++  -DF `for N in MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC  
MULCC MULCF MULFC DIVCC DIVCF DIVFC PLUS MINUS EQCC EQCF EQFC NECC  
NECF NEFC ABS ARG POLAR CONJ NORM COS COSH EXP LOG POWCC POWCF POWCI  
POWFC SIN SINH SQRT; do echo " -D${N}"; done` \
  ./cinst.cc -o fcomplex.o
In file included from cmath:7,
                 from std/complext.h:34,
                 from complex:7,
                 from std/complext.cc:28,
                 from ./cinst.cc:29:
/NextDeveloper/Headers/ansi/math.h:59: warning: declaration of  
`const double cos(double)'
/NextDeveloper/Headers/ansi/math.h:59: warning: conflicts with  
built-in declaration `double cos(double)'
/NextDeveloper/Headers/ansi/math.h:60: warning: declaration of  
`const double sin(double)'
/NextDeveloper/Headers/ansi/math.h:60: warning: conflicts with  
built-in declaration `double sin(double)'
/NextDeveloper/Headers/ansi/math.h:72: warning: declaration of  
`const double sqrt(double)'
/NextDeveloper/Headers/ansi/math.h:72: warning: conflicts with  
built-in declaration `double sqrt(double)'
In file included from complex:7,
                 from std/complext.cc:28,
                 from ./cinst.cc:29:
std/complext.h:314: declaration of C function `double hypot(double,  
double)' conflicts with
/NextDeveloper/Headers/ansi/math.h:26: previous declaration `const  
double hypot(double, double)' here
make[2]: *** [bigstmp-complex] Error 1

despite the fact that /NextDeveloper/Headers/ansi/math.h has been  
fixed by `fixincludes'.  Is there a way to override the fact that  
/Users/toon/Unix/compilers/egcs-971114/gcc/include
should be used (the ansi/math.h in that directory is OK) ?

Toon.