From owner-freebsd-current@FreeBSD.ORG  Mon Aug 25 19:30:42 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 155DD16A4BF
	for <current@freebsd.org>; Mon, 25 Aug 2003 19:30:42 -0700 (PDT)
Received: from ion.gank.org (ion.gank.org [198.78.66.164])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7D7B743FB1
	for <current@freebsd.org>; Mon, 25 Aug 2003 19:30:41 -0700 (PDT)
	(envelope-from craig@xfoil.gank.org)
Received: from localhost (ion.gank.org [198.78.66.164])
	by ion.gank.org (GankMail) with ESMTP id 064022D1BA
	for <current@freebsd.org>; Mon, 25 Aug 2003 21:30:41 -0500 (CDT)
Received: from ion.gank.org ([198.78.66.164])
 by localhost (ion.gank.org [198.78.66.164]) (amavisd-new, port 10024)
 with LMTP id 62359-02 for <current@freebsd.org>;
 Mon, 25 Aug 2003 21:30:40 -0500 (CDT)
Received: from aldaris.auir.gank.org (dsl081-113-221.dfw1.dsl.speakeasy.net
	[64.81.113.221])	by ion.gank.org (GankMail) with ESMTP id 911EB2BB30
	for <current@freebsd.org>; Mon, 25 Aug 2003 21:30:39 -0500 (CDT)
From: Craig Boston <craig@xfoil.gank.org>
To: current@freebsd.org
Date: Mon, 25 Aug 2003 21:31:18 -0500
User-Agent: KMail/1.5.3
References: <200308252127.59003.craig@xfoil.gank.org>
In-Reply-To: <200308252127.59003.craig@xfoil.gank.org>
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_2ZsS/0rNyZ5cvnR"
Message-Id: <200308252131.18210.craig@xfoil.gank.org>
X-Virus-Scanned: by amavisd-new at gank.org
Subject: Re: cvs commit: src/sys/sys soundcard.h vs. gkrellmvolume2
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Aug 2003 02:30:42 -0000


--Boundary-00=_2ZsS/0rNyZ5cvnR
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Monday 25 August 2003 09:27 pm, Craig Boston wrote:
> Anyway, I'm attaching a quick workaround if anyone else running current
> runs in to this.

Earth to brain, come in please!  Actually attaching the patch this time.

--Boundary-00=_2ZsS/0rNyZ5cvnR
Content-Type: text/plain;
  charset="iso-8859-1";
  name="patch-sound-mixer-info"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="patch-sound-mixer-info"

--- unix_mixer.c.orig	Mon Aug 25 21:10:46 2003
+++ unix_mixer.c	Mon Aug 25 21:15:03 2003
@@ -36,6 +36,10 @@
 #include "mixer.h"
 #include "common_mixer.h"
 
+#ifdef SOUND_MIXER_INFO
+#undef SOUND_MIXER_INFO
+#endif
+
 /* tries to open a mixer device, returns NULL on error or otherwise an mixer_t
  * struct */
 mixer_t *mixer_open(char *id) {

--Boundary-00=_2ZsS/0rNyZ5cvnR--