[Liboss-commit] CVS: liboss/include soundcard.h,1.12,1.13

[Benjamin R. <ran...@us...>]

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

Modified Files:
	soundcard.h 
Log Message:
let you override the function names that get inlined


Index: soundcard.h
===================================================================
RCS file: /cvsroot/liboss/liboss/include/soundcard.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- soundcard.h	6 Nov 2002 03:14:54 -0000	1.12
+++ soundcard.h	6 Nov 2002 17:36:34 -0000	1.13
@@ -312,26 +312,39 @@
 #undef ioctl
 #undef open
 #undef close
+
+#ifndef LIBOSS_IOCTL
+# define LIBOSS_IOCTL ioctl
+#endif
+
+#ifndef LIBOSS_OPEN
+# define LIBOSS_OPEN open
+#endif
+
+#ifndef LIBOSS_CLOSE
+# define LIBOSS_CLOSE close
+#endif
+
 #ifndef LIBOSS_INTERNAL
 extern int liboss_ioctl (int,unsigned long,va_list);
 extern int liboss_open (const char *,int,va_list);
 extern int liboss_close (int);
 
-static inline int ioctl (int x, unsigned long y,...)
+static inline int LIBOSS_IOCTL (int x, unsigned long y,...)
 {
     va_list l;
     va_start(l,y);
     return liboss_ioctl(x,y,l);
 }
 
-static inline int open (const char* x, int y,...)
+static inline int LIBOSS_OPEN (const char* x, int y,...)
 {
     va_list l;
     va_start(l,y);
     return liboss_open(x,y,l);
 }
 
-static inline int close (int x) {liboss_close(x); return x;}
+static inline int LIBOSS_CLOSE (int x) {liboss_close(x); return x;}
 #else
 extern int liboss_ioctl (int,unsigned long,va_list);
 extern int liboss_open (const char *,int,va_list);