[PATCH 2/4] modules/audio_output/oss.c: ifdef some ioctls. Fix build on GNU/Hurd.

[Gabriele Giacone]

---
 modules/audio_output/oss.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 97d7c73..16b461c 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -35,6 +35,8 @@
 #include <sys/ioctl.h>
 #ifdef HAVE_SOUNDCARD_H
 # include <soundcard.h>
+#elif __GNU__
+# include <linux/soundcard.h>
 #else
 # include <sys/soundcard.h>
 #endif
@@ -371,11 +373,13 @@ static int DevicesEnum (audio_output_t *aout)
     oss_sysinfo si;
     int n = -1;
 
+#ifndef __GNU__
     if (ioctl (fd, SNDCTL_SYSINFO, &si) < 0)
     {
         msg_Err (aout, "cannot get system infos: %s", vlc_strerror(errno));
         goto out;
     }
+#endif
 
     msg_Dbg (aout, "using %s version %s (0x%06X) under %s", si.product,
              si.version, si.versionnum, si.license);
@@ -384,12 +388,14 @@ static int DevicesEnum (audio_output_t *aout)
     {
         oss_audioinfo ai = { .dev = i };
 
+#ifndef __GNU__
         if (ioctl (fd, SNDCTL_AUDIOINFO, &ai) < 0)
         {
             msg_Warn (aout, "cannot get device %d infos: %s", i,
                       vlc_strerror_c(errno));
             continue;
         }
+#endif
         if (ai.caps & (PCM_CAP_HIDDEN|PCM_CAP_MODEM))
             continue;
         if (!(ai.caps & PCM_CAP_OUTPUT))
-- 
1.9.0.rc3


-- 
To UNSUBSCRIBE, email to debian-hurd-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/454df5a484c68678caa888d6bdf90a35ac088ae8.1392651739.git.1o5g4...@gmail.com