Changeset 3169:686441722100 in roaraudio for libroaross/libroaross.c

Timestamp:

01/15/10 19:47:54 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

ioctl() prototype depends on OS, test and use correct one

File:

• libroaross/libroaross.c (modified) (3 diffs)

libroaross/libroaross.c

@@ -76 +76 @@
 #endif
 
+#ifdef ROAR_OS_NETBSD
+#define IOCTL() int _oss_ioctl __P((int fd, unsigned long com, void *argp))
+#define map_args int __fd = fd; unsigned long int __request = request;
+#else
+#define IOCTL() int ioctl (int __fd, unsigned long int __request, ...)
+#define map_args void * argp;
+#define va_argp
+#endif
+
 #define OSS_VOLUME_SCALE 100
 
@@ -750 +759 @@
 }
 
-int ioctl (int __fd, unsigned long int __request, ...) {
+IOCTL() {
+ map_args;
  struct pointer * pointer;
  struct handle  * handle;
+ int * ip = NULL;
+#ifdef va_argp
  va_list args;
- void *argp;
- int * ip = NULL;
+#endif
 
  _init();
@@ -761 +772 @@
 // ROAR_DBG("ioctl(__fd=%i, __request=%lu) = ?", __fd, (long unsigned int) __request);
 
+#ifdef va_argp
  va_start (args, __request);
  argp = va_arg (args, void *);
  va_end (args);
+#endif
 
 // ROAR_DBG("ioctl(__fd=%i, __request=%lu): argp=%p", __fd, (long unsigned int) __request, argp);