Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libossaudio/Attic/ossaudio.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libossaudio/Attic/ossaudio.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.26.2.1
retrieving revision 1.27
diff -u -p -r1.26.2.1 -r1.27
--- src/lib/libossaudio/Attic/ossaudio.c	2012/05/23 10:07:32	1.26.2.1
+++ src/lib/libossaudio/Attic/ossaudio.c	2012/05/04 11:48:12	1.27
@@ -1,4 +1,4 @@
-/*	$NetBSD: ossaudio.c,v 1.26.2.1 2012/05/23 10:07:32 yamt Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.27 2012/05/04 11:48:12 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.26.2.1 2012/05/23 10:07:32 yamt Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.27 2012/05/04 11:48:12 christos Exp $");
 
 /*
  * This is an OSS (Linux) sound API emulator.
@@ -549,7 +549,7 @@ getdevinfo(int fd)
 	mixer_devinfo_t mi;
 	int i, j, e;
 	static struct {
-		const char *name;
+		char *name;
 		int code;
 	} *dp, devs[] = {
 		{ AudioNmicrophone,	SOUND_MIXER_MIC },
@@ -574,7 +574,7 @@ getdevinfo(int fd)
 /*		{ AudioNmixerout,	?? },*/
 		{ 0, -1 }
 	};
-	static struct audiodevinfo devcache = { .done = 0 };
+	static struct audiodevinfo devcache = { 0 };
 	struct audiodevinfo *di = &devcache;
 	struct stat sb;
 	size_t mlen, dlen;
@@ -826,7 +826,7 @@ static void
 setblocksize(int fd, struct audio_info *info)
 {
 	struct audio_info set;
-	size_t s;
+	int s;
 
 	if (info->blocksize & (info->blocksize-1)) {
 		for(s = 32; s < info->blocksize; s <<= 1)