Mercurial Mercurial > sustaining > oi_151a > oi-build / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/qemu-kvm/patches/ossaudio.patch
author Alasdair Lumsden <al@everycity.co.uk>
Fri, 19 Aug 2011 17:51:36 +0000
branchoi_151a
changeset 243 7b3576fcec69
permissions -rw-r--r--
Initial addition of illumos-kvm
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
243
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
     1
 
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
     2
 
index b49e102..724f696 100644
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
     3
 
--- a/audio/ossaudio.c
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
     4
 
+++ b/audio/ossaudio.c
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
     5
 
@@ -315,10 +315,12 @@ static int oss_open (int in, struct oss_params *req,
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
     6
 
         goto err;
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
     7
 
     }
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
     8
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
     9
 
+#ifndef CONFIG_SOLARIS
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
    10
 
     if (ioctl (fd, SNDCTL_DSP_NONBLOCK, NULL)) {
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
    11
 
         oss_logerr2 (errno, typ, "Failed to set non-blocking mode\n");
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
    12
 
         goto err;
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
    13
 
     }
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
    14
 
+#endif
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
    15
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
    16
 
 #ifdef USE_DSP_POLICY
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
    17
 
     if (conf.policy >= 0) {
7b3576fcec69 Initial addition of illumos-kvm
Alasdair Lumsden <al@everycity.co.uk>
parents:
diff changeset 
    18
 














sustaining/oi_151a/oi-build