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/soundcard.h,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libossaudio/soundcard.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.19.4.1
retrieving revision 1.20
diff -u -p -r1.19.4.1 -r1.20
--- src/lib/libossaudio/soundcard.h	2012/05/07 16:55:33	1.19.4.1
+++ src/lib/libossaudio/soundcard.h	2012/05/04 11:48:12	1.20
@@ -1,4 +1,4 @@
-/*	$NetBSD: soundcard.h,v 1.19.4.1 2012/05/07 16:55:33 riz Exp $	*/
+/*	$NetBSD: soundcard.h,v 1.20 2012/05/04 11:48:12 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -291,18 +291,24 @@ typedef struct buffmem_desc {
 	int size;
 } buffmem_desc;
 
+#if 0
+/* This is what we'd like to have, but it causes prototype conflicts. */
 #define ioctl _oss_ioctl
+#else
 /*
- * If we already included <sys/ioctl.h>, then we define our own prototype,
- * else we depend on <sys/ioctl.h> to do it for us. We do it this way, so
- * that we don't define the prototype twice.
+ * XXX force inclusion of <sys/ioctl.h> before we redefine
+ * ioctl() to avoid a prototype conflict.
+ * Its multiple inclusion protection will keep this from
+ * happening if it is pulled in later.
  */
-#ifndef _SYS_IOCTL_H_
 #include <sys/ioctl.h>
-#else
+#define ioctl(x, y, ...) _oss_ioctl(x, y, __VA_ARGS__)
+#endif
+
+#include <sys/cdefs.h>
+
 __BEGIN_DECLS
 int _oss_ioctl(int, unsigned long, ...);
 __END_DECLS
-#endif
 
 #endif /* !_SOUNDCARD_H_ */