build: Drop redundant check for soundcard.h
authorDiego Biurrun <diego@biurrun.de>
Tue, 26 Sep 2017 14:57:17 +0000 (16:57 +0200)
committerDiego Biurrun <diego@biurrun.de>
Tue, 10 Oct 2017 21:20:17 +0000 (23:20 +0200)
It should be sys/soundcard.h nowadays.

configure
libavdevice/oss.c

index 45886ed..37b3f20 100755 (executable)
--- a/configure
+++ b/configure
@@ -1575,7 +1575,6 @@ HEADERS_LIST="
     machine_ioctl_meteor_h
     malloc_h
     poll_h
-    soundcard_h
     stdatomic_h
     sys_param_h
     sys_resource_h
@@ -2465,8 +2464,8 @@ jack_indev_deps="libjack"
 jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
 libcdio_indev_deps="libcdio"
 libdc1394_indev_deps="libdc1394"
-oss_indev_deps_any="soundcard_h sys_soundcard_h"
-oss_outdev_deps_any="soundcard_h sys_soundcard_h"
+oss_indev_deps_any="sys_soundcard_h"
+oss_outdev_deps_any="sys_soundcard_h"
 pulse_indev_deps="libpulse"
 sndio_indev_deps="sndio"
 sndio_outdev_deps="sndio"
@@ -4857,7 +4856,6 @@ check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_def
 check_header dev/ic/bt8xx.h
 
 check_header sys/soundcard.h
-check_header soundcard.h
 
 enabled_any alsa_indev alsa_outdev &&
     check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
index eb8d454..e504438 100644 (file)
 #include "config.h"
 
 #include <string.h>
-
-#if HAVE_SOUNDCARD_H
-#include <soundcard.h>
-#else
-#include <sys/soundcard.h>
-#endif
-
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <sys/soundcard.h>
 
 #include "libavutil/log.h"