[CVS broken] stream2file.cpp & ringbuffer.c

[nitr8]

stream2file.cpp & ringbuffer.c that was checked in late last night seem to be breaking the build. If i remove those changes it works fine.

then mv -f ".deps/genpsi.Tpo" ".deps/genpsi.Po"; else rm -f ".deps/genpsi.Tpo"; exit 1; fi
if powerpc-tuxbox-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I../../daemons -I../../src -I/home/nitr8/uberninja/dbox2/cdkroot/include/tuxbox -I/home/nitr8/uberninja/dbox2/cdkroot/include/freetype2 -I/home/nitr8/uberninja/dbox2/cdkroot/include/tuxbox -I/home/nitr8/uberninja/dbox2/cdkroot/include/tuxbox -I/home/nitr8/uberninja/dbox2/cdkroot/include/tuxbox/mpegtools -I../../lib -I/home/nitr8/uberninja/tuxbox-cvs/driver/dvb/include -I/home/nitr8/uberninja/tuxbox-cvs/driver/include -Wall -mcpu=823 -pipe -Os -MT stream2file.o -MD -MP -MF ".deps/stream2file.Tpo" -c -o stream2file.o stream2file.cpp; \
then mv -f ".deps/stream2file.Tpo" ".deps/stream2file.Po"; else rm -f ".deps/stream2file.Tpo"; exit 1; fi
stream2file.cpp: In function `void* DMXThread(void*)':
stream2file.cpp:276: error: cannot convert `stream2file_error_msg_t' to `stream2file_status_t' in assignment
make[5]: *** [stream2file.o] Error 1
make[5]: Leaving directory `/home/nitr8/uberninja/tuxbox-cvs/apps/tuxbox/neutrino/src/driver'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/home/nitr8/uberninja/tuxbox-cvs/apps/tuxbox/neutrino/src/driver'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/home/nitr8/uberninja/tuxbox-cvs/apps/tuxbox/neutrino/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/nitr8/uberninja/tuxbox-cvs/apps/tuxbox/neutrino'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/nitr8/uberninja/tuxbox-cvs/apps/tuxbox/neutrino'
make: *** [/home/nitr8/uberninja/dbox2/cdkflash/root-neutrino] Error 2

--me