[vlc-commits] [Git][videolan/vlc][master] Simplify OSS check by removing OpenBSD specific header check

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
61785764 by Brad Smith at 2022-11-30T11:02:24+00:00
Simplify OSS check by removing OpenBSD specific header check

OpenBSD has long since stopped using OSS in favor of sndio.

- - - - -


3 changed files:

- configure.ac
- modules/access/oss.c
- modules/audio_output/oss.c


Changes:

=====================================
configure.ac
=====================================
@@ -3760,14 +3760,14 @@ dnl
 AC_ARG_ENABLE([oss],
   AS_HELP_STRING([--enable-oss],
     [support the Open Sound System OSS (default enabled on FreeBSD/NetBSD/DragonFlyBSD)]),, [
-  AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [
+  AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "linux"], [
     enable_oss="no"
   ])
 ])
 have_oss="no"
 OSS_LIBS=""
 AS_IF([test "$enable_oss" != "no"], [
-  AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [
+  AC_CHECK_HEADERS([sys/soundcard.h], [
     have_oss="yes"
     AC_CHECK_LIB([ossaudio], [main], [
       OSS_LIBS="-lossaudio"


=====================================
modules/access/oss.c
=====================================
@@ -43,12 +43,7 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 
-#ifdef HAVE_SYS_SOUNDCARD_H
-#  include <sys/soundcard.h>
-#endif
-#ifdef HAVE_SOUNDCARD_H
-#  include <soundcard.h>
-#endif
+#include <sys/soundcard.h>
 
 #include <poll.h>
 


=====================================
modules/audio_output/oss.c
=====================================
@@ -33,11 +33,8 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_SOUNDCARD_H
-# include <soundcard.h>
-#else
-# include <sys/soundcard.h>
-#endif
+
+#include <sys/soundcard.h>
 
 #ifndef SNDCTL_DSP_HALT
 # define SNDCTL_DSP_HALT SNDCTL_DSP_RESET



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/61785764c0bd395215550aa68334eec936f75aaf

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/61785764c0bd395215550aa68334eec936f75aaf
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance