From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NTKrW-0007tP-Py
	for qemu-devel@nongnu.org; Fri, 08 Jan 2010 14:51:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NTKrV-0007sA-B1
	for qemu-devel@nongnu.org; Fri, 08 Jan 2010 14:51:10 -0500
Received: from [199.232.76.173] (port=56163 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NTKrV-0007rz-6Y
	for qemu-devel@nongnu.org; Fri, 08 Jan 2010 14:51:09 -0500
Received: from gelbbaer.kn-bremen.de ([78.46.108.116]:59973
	helo=smtp.kn-bremen.de)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <nox@jelal.kn-bremen.de>) id 1NTKrU-0006aT-My
	for qemu-devel@nongnu.org; Fri, 08 Jan 2010 14:51:08 -0500
From: Juergen Lock <nox@jelal.kn-bremen.de>
Date: Fri, 8 Jan 2010 20:46:37 +0100
Subject: Re: [Qemu-devel] [PATCH] Fix build if OSS_GETVERSION is not defined
Message-ID: <20100108194637.GA36023@triton8.kn-bremen.de>
References: <20100107222343.GA90709@triton8.kn-bremen.de>
	<Pine.LNX.4.64.1001081126540.2237@linmac.oyster.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <Pine.LNX.4.64.1001081126540.2237@linmac.oyster.ru>
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: malc <av1474@comtv.ru>
Cc: Juergen Lock <nox@jelal.kn-bremen.de>, qemu-devel@nongnu.org

On Fri, Jan 08, 2010 at 11:27:13AM +0300, malc wrote:
> On Thu, 7 Jan 2010, Juergen Lock wrote:
> 
> > In this case it was missing on FreeBSD <= 6.x  (Which also doesn't have
> > SNDCTL_DSP_POLICY yet so the version doesn't get used anyway.)
> 
> I've commited slightly different fix for the issue, thanks.
> 
Hmm looking at the last hunk of the commit,

>[...]
>@@ -289,9 +292,17 @@ static int oss_open (int in, struct oss_params *req,
>     if (conf.debug) {
>         dolog ("OSS version = %#x\n", version);
>     }
>+#endif
> 
> #ifdef SNDCTL_DSP_POLICY
>-    if (conf.policy >= 0 && version >= 0x040000) {
>+    if (conf.policy >= 0
>+#ifdef OSS_GETVERSION
>+        && version >= 0x040000
>+#else
>+        0

 ...these last two lines (#else and 0) probably should go, I dont think
the compiler likes whitespace between digits. :)

>+#endif
>+        )
>+    {
>         int policy = conf.policy;
>         if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) {
>             oss_logerr2 (errno, typ, "Failed to set timing policy to %d\n",
>-- 
>1.6.6

 And also I forgot to say this is stable-0.12 material too.

 And thanx for committing!
	Juergen