← Back to branch summary

~ubuntu-branches/ubuntu/wily/oss4/wily

« back to all changes in this revision

Viewing changes to include/soundcard.h

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien NOEL, Sebastien NOEL
  • Date: 2011-10-15 15:22:51 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20111015152251-o3niiwq0ut6v2gn4
Tags: 4.2-build2005-1
http://bugs.debian.org/632296
http://bugs.debian.org/625398
http://bugs.debian.org/636631
http://bugs.debian.org/644685
http://bugs.debian.org/640829
[ Sebastien NOEL ]
* New upstream release.
* debian/patches/os_cmd: add a new option to ossdetect to choose
  the devices nodes' owner (Closes: #632296).
* add debian/patches/gcc-4.6.patch (Closes: #625398).
* add debian/patches/kfreebsd-gnu.patch to build liboss4-salsa2
  and oss4-gtk on GNU/kFreeBSD, thanks to Robert Millan! (Closes: #636631).
* debian/control: stop providing libasound-dev (Closes: #644685).
* debian/create-ma-tree.sh: fix oss4-dkms installation (Closes: #640829).

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/soundcard.h
50
50
/* In Linux we need to be prepared for cross compiling */
51
51
#include <linux/ioctl.h>
52
52
#else
53
 
# ifdef __FreeBSD__
 
53
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
54
54
#    include <sys/ioccom.h>
55
55
# else
56
56
#    include <sys/ioctl.h>