Can't build CVS rtems-4-7-branch

[Eric Norum]

I did a CVS update on the rtems-4-7-branch today and then tried  
building for various targets.  The uC5282 and pc386 targets seem to  
build fine, but the mvme2100 target gets:


powerpc-rtems4.7-gcc --pipe -DHAVE_CONFIG_H   -I.. -I../../ 
cpukit/../../../mvme2100/lib/include -D__RTEMS_INSIDE__  -Wall -fasm - 
mcpu=603e -Dmpc603e -Dppc603e -O2 -g -mmultiple -mstring -mstrict- 
align -MT src/libscore_a-coremsgflushsupp.o -MD -MP -MF src/.deps/ 
libscore_a-coremsgflushsupp.Tpo -c -o src/libscore_a- 
coremsgflushsupp.o `test -f 'src/coremsgflushsupp.c' || echo '/home/ 
phoebus/NORUME/src/RTEMS/cvs/rtems/c/src/../../cpukit/score/'`src/ 
coremsgflushsupp.c
mv -f src/.deps/libscore_a-coremsgflushsupp.Tpo src/.deps/libscore_a- 
coremsgflushsupp.Po
powerpc-rtems4.7-gcc --pipe -DHAVE_CONFIG_H   -I.. -I../../ 
cpukit/../../../mvme2100/lib/include -D__RTEMS_INSIDE__  -Wall -fasm - 
mcpu=603e -Dmpc603e -Dppc603e -O2 -g -mmultiple -mstring -mstrict- 
align -MT src/libscore_a-coremsgseize.o -MD -MP -MF src/.deps/ 
libscore_a-coremsgseize.Tpo -c -o src/libscore_a-coremsgseize.o `test  
-f 'src/coremsgseize.c' || echo '/home/phoebus/NORUME/src/RTEMS/cvs/ 
rtems/c/src/../../cpukit/score/'`src/coremsgseize.c
/home/phoebus/NORUME/src/RTEMS/cvs/rtems/c/src/../../cpukit/score/src/ 
coremsgseize.c:70: error: conflicting types for  
'_CORE_message_queue_Seize'
../../cpukit/../../../mvme2100/lib/include/rtems/score/coremsg.h:395:  
error: previous declaration of '_CORE_message_queue_Seize' was here
make[6]: *** [src/libscore_a-coremsgseize.o] Error 1
make[6]: Leaving directory `/usr/local/rtems/Build/powerpc/powerpc- 
rtems4.7/c/mvme2100/cpukit/score'
make[5]: *** [all-recursive] Error 1
make[5]: Leaving directory `/usr/local/rtems/Build/powerpc/powerpc- 
rtems4.7/c/mvme2100/cpukit/score'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/usr/local/rtems/Build/powerpc/powerpc- 
rtems4.7/c/mvme2100/cpukit'
make[3]: *** [all] Error 2
make[3]: Leaving directory `/usr/local/rtems/Build/powerpc/powerpc- 
rtems4.7/c/mvme2100/cpukit'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/usr/local/rtems/Build/powerpc/powerpc- 
rtems4.7/c/mvme2100'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/usr/local/rtems/Build/powerpc/powerpc- 
rtems4.7/c'
make: *** [all-recursive] Error 1
make: Leaving directory `/usr/local/rtems/Build/powerpc'


-- 
Eric Norum <norume at aps.anl.gov>
Advanced Photon Source
Argonne National Laboratory
(630) 252-4793