Re: [Qemu-devel] cvs oss.c

[Sylvain Petreolle]

 --- Bob Barry <address@hidden> a écrit : 
> For the last few days cvs has failed to compile for me, failing in oss.c.
Make sure that oss.c, vl.c an vl.h are the original CVS versions.
I had the same results and a 'cvs status oss.c' said I had conflicts on merge...

> /usr/portage/distfiles/cvs-src/qemu/oss.c:318: conflicting types for 
> `AUD_open'
> /usr/portage/distfiles/cvs-src/qemu/vl.h:563: previous declaration of 
> `AUD_open'
> /usr/portage/distfiles/cvs-src/qemu/oss.c:323: conflicting types for 
> `AUD_write'
> /usr/portage/distfiles/cvs-src/qemu/vl.h:564: previous declaration of 
> `AUD_write'
> /usr/portage/distfiles/cvs-src/qemu/oss.c:448: conflicting types for 
> `AUD_adjust_estimate'
> /usr/portage/distfiles/cvs-src/qemu/vl.h:565: previous declaration of 
> `AUD_adjust_estimate'
> /usr/portage/distfiles/cvs-src/qemu/oss.c:453: conflicting types for 
> `AUD_get_free'
> /usr/portage/distfiles/cvs-src/qemu/vl.h:566: previous declaration of 
> `AUD_get_free'
> /usr/portage/distfiles/cvs-src/qemu/oss.c:520: conflicting types for 
> `AUD_get_buffer_size'
> /usr/portage/distfiles/cvs-src/qemu/vl.h:567: previous declaration of 
> `AUD_get_buffer_size'

=====
Sylvain Petreolle (spetreolle_at_users_dot_sourceforge_dot_net)
Say NO to software patents
Dites NON aux brevets logiciels

"You believe it's the year 1984, when in fact, its closer to 2184"1984 / Matrix