[Liboss-commit] CVS: liboss/include soundcard.h,1.3,1.4

[Alexander S. <mrv...@us...>]

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

Modified Files:
	soundcard.h 
Log Message:
More changes. It now compiles. osscat crashes trying to call a symbol acquired from dlsym (open), but i don't think it's dlcompat's fault

Index: soundcard.h
===================================================================
RCS file: /cvsroot/liboss/liboss/include/soundcard.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- soundcard.h	18 Oct 2002 02:50:51 -0000	1.3
+++ soundcard.h	18 Oct 2002 22:00:24 -0000	1.4
@@ -286,19 +286,22 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
+#ifndef LIBOSS_INTERNAL
 #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 open(x,y,z...) oss_open(x,y,z)
+#define close(x) oss_close(x)
 #endif
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int oss_ioctl __P((int fd, request_t request, ...));
-int oss_open __P((const char *pathname, int flags, ...));
+//int oss_ioctl __P((int fd, request_t request, ...));
+//int oss_open __P((const char *pathname, int flags, ...));
 __END_DECLS
+#endif
 
 #endif /* !_SOUNDCARD_H_ */