[BACK]Return to soundcard.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libossaudio

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libossaudio/soundcard.h between version 1.19.4.1 and 1.20

version 1.19.4.1, 2012/05/07 16:55:33 version 1.20, 2012/05/04 11:48:12
Line 291  typedef struct buffmem_desc {
Line 291  typedef struct buffmem_desc {
         int size;          int size;
 } buffmem_desc;  } buffmem_desc;
   
   #if 0
   /* This is what we'd like to have, but it causes prototype conflicts. */
 #define ioctl _oss_ioctl  #define ioctl _oss_ioctl
   #else
 /*  /*
  * If we already included <sys/ioctl.h>, then we define our own prototype,   * XXX force inclusion of <sys/ioctl.h> before we redefine
  * else we depend on <sys/ioctl.h> to do it for us. We do it this way, so   * ioctl() to avoid a prototype conflict.
  * that we don't define the prototype twice.   * Its multiple inclusion protection will keep this from
    * happening if it is pulled in later.
  */   */
 #ifndef _SYS_IOCTL_H_  
 #include <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  __BEGIN_DECLS
 int _oss_ioctl(int, unsigned long, ...);  int _oss_ioctl(int, unsigned long, ...);
 __END_DECLS  __END_DECLS
 #endif  
   
 #endif /* !_SOUNDCARD_H_ */  #endif /* !_SOUNDCARD_H_ */

Legend:
Removed from v.1.19.4.1  
changed lines
  Added in v.1.20

CVSweb <webmaster@jp.NetBSD.org>