← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/audacity/gutsy-backports

« back to all changes in this revision

Viewing changes to debian/patches/kfreebsd.patch

  • Committer: Bazaar Package Importer
  • Author(s): John Dong
  • Date: 2008-02-18 21:58:19 UTC
  • mfrom: (13.1.2 hardy)
  • Revision ID: james.westby@ubuntu.com-20080218215819-tmbcf1rx238r8gdv
Tags: 1.3.4-1.1ubuntu1~gutsy1
Automated backport upload; no source changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kfreebsd.patch
1
 
only in patch2:
2
 
unchanged:
3
 
--- lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c
4
 
+++ lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c
5
 
@@ -63,7 +63,7 @@
6
 
 #include <limits.h>
7
 
 #include <semaphore.h>
8
 
 
9
 
-#ifdef __FreeBSD__
10
 
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
11
 
 # include <sys/soundcard.h>
12
 
 # define DEVICE_NAME_BASE            "/dev/dsp"
13
 
 #elif defined __linux__
14
 
only in patch2:
15
 
unchanged:
16
 
--- lib-src/portaudio/pa_unix_oss/pa_unix_oss.c
17
 
+++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c
18
 
@@ -42,7 +42,7 @@
19
 
 
20
 
 #if defined(__linux__)
21
 
 #include <linux/soundcard.h>
22
 
-#elif defined(__FreeBSD__)
23
 
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
24
 
 #include <sys/soundcard.h>
25
 
 #else
26
 
 #include <machine/soundcard.h> /* JH20010905 */
27
 
only in patch2:
28
 
unchanged:
29
 
--- lib-src/libnyquist/snd/sndconfig.h
30
 
+++ lib-src/libnyquist/snd/sndconfig.h
31
 
@@ -60,7 +60,7 @@
32
 
 #elif defined(IRIX)
33
 
   #include "sndirix.h"
34
 
 
35
 
-#elif defined(__FreeBSD__)
36
 
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
37
 
   #include "sndfreebsd.h"
38
 
 
39
 
 #elif defined(_WIN32)