[Liboss-commit] CVS: liboss/include soundcard.h,1.1.1.1,1.2

[Dave V. <va...@us...>]

Update of /cvsroot/liboss/liboss/include
In directory usw-pr-cvs1:/tmp/cvs-serv11401/include

Modified Files:
	soundcard.h 
Log Message:
Compiles, but does nothing.


Index: soundcard.h
===================================================================
RCS file: /cvsroot/liboss/liboss/include/soundcard.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- soundcard.h	3 May 2002 16:20:01 -0000	1.1.1.1
+++ soundcard.h	9 May 2002 07:48:32 -0000	1.2
@@ -36,16 +36,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
- * WARNING!  WARNING!
- * This is an OSS (Linux) audio emulator.
- * Use the Native NetBSD API for developing new code, and this
- * only for compiling Linux programs.
- */
-
 #ifndef _SOUNDCARD_H_
 #define _SOUNDCARD_H_
 
+/* FIXME: what is this? */
 #define SOUND_VERSION	0x030001
 
 #define	SNDCTL_DSP_RESET		_IO  ('P', 0)
@@ -288,17 +282,23 @@
 	int size;
 } buffmem_desc;
 
+/* Make sure we don't override the headers by accident! */
+#include <fcntl.h>
+#include <sys/ioctl.h>
+
 #if 0
 /* This is what we'd like to have, but it causes prototype conflicts. */
 #define ioctl _oss_ioctl
 #else
-#define ioctl(x,y,z) _oss_ioctl(x,y,z)
+#define ioctl(x,y,z) oss_ioctl(x,y,z)
+#define open(x,y,z) oss_open(x,y,z)
 #endif
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int _oss_ioctl __P((int fd, unsigned long com, void *argp));
+int oss_ioctl __P((int fd, unsigned long com, void *argp));
+int oss_open __P((const char *path, int flags, mode_t mode));
 __END_DECLS
 
 #endif /* !_SOUNDCARD_H_ */