From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CDrYk-0001Fp-0b
	for qemu-devel@nongnu.org; Sat, 02 Oct 2004 17:36:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CDrYj-0001FS-Ag
	for qemu-devel@nongnu.org; Sat, 02 Oct 2004 17:36:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CDrYj-0001FA-6D
	for qemu-devel@nongnu.org; Sat, 02 Oct 2004 17:36:53 -0400
Received: from [206.190.38.143] (helo=web51101.mail.yahoo.com)
	by monty-python.gnu.org with smtp (Exim 4.34) id 1CDrRm-0008N3-VY
	for qemu-devel@nongnu.org; Sat, 02 Oct 2004 17:29:43 -0400
Message-ID: <20041002212941.89304.qmail@web51101.mail.yahoo.com>
Date: Sat, 2 Oct 2004 23:29:41 +0200 (CEST)
From: Sylvain Petreolle <spetreolle@yahoo.fr>
Subject: Re: [Qemu-devel] cvs oss.c
In-Reply-To: <200410022326.30505.bobb@absamail.co.za>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Reply-To: spetreolle@users.sourceforge.net, qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

 --- Bob Barry <bobb@absamail.co.za> 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