qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Sylvain Petreolle <spetreolle@yahoo.fr>
To: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] cvs oss.c
Date: Sat, 2 Oct 2004 23:29:41 +0200 (CEST)	[thread overview]
Message-ID: <20041002212941.89304.qmail@web51101.mail.yahoo.com> (raw)
In-Reply-To: <200410022326.30505.bobb@absamail.co.za>

 --- 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

      reply	other threads:[~2004-10-02 21:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-10-02 21:26 [Qemu-devel] cvs oss.c Bob Barry
2004-10-02 21:29 ` Sylvain Petreolle [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041002212941.89304.qmail@web51101.mail.yahoo.com \
    --to=spetreolle@yahoo.fr \
    --cc=qemu-devel@nongnu.org \
    --cc=spetreolle@users.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).