configure.ac: Update comment in OSS includes check.

Original commit message from CVS:
* configure.ac:
Update comment in OSS includes check.
* sys/oss/gstossdmabuffer.c:
* sys/oss/gstosshelper.c:
* sys/oss/gstossmixer.c:
* sys/oss/gstossmixertrack.c:
* sys/oss/gstosssink.c:
* sys/oss/gstosssrc.c:
* sys/oss/oss_probe.c:
Don't assume the OSS soundcard.h include is always in
the sys/ directory. Instead, use the existing defines
from config.h to include the right file. Fixes
compilation on OpenBSD 3.8 (#323718).

9 files changed, 113 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index f5fe9d5a..e73a99e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-12-10  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	  Update comment in OSS includes check.
+
+	* sys/oss/gstossdmabuffer.c:
+	* sys/oss/gstosshelper.c:
+	* sys/oss/gstossmixer.c:
+	* sys/oss/gstossmixertrack.c:
+	* sys/oss/gstosssink.c:
+	* sys/oss/gstosssrc.c:
+	* sys/oss/oss_probe.c:
+	  Don't assume the OSS soundcard.h include is always in
+	  the sys/ directory. Instead, use the existing defines
+	  from config.h to include the right file. Fixes
+	  compilation on OpenBSD 3.8 (#323718).
+
 2005-12-09  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* docs/plugins/gst-plugins-good-plugins-sections.txt:
diff --git a/configure.ac b/configure.ac
index d7935693..a7d069fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,7 +259,7 @@ dnl Linux and newer BSD versions :
  AC_CHECK_HEADER(sys/soundcard.h, [
    AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/])
    ] , [
-dnl Some old BSD versions :
+dnl Some old BSD versions and also newer OpenBSD versions :
    AC_CHECK_HEADER(soundcard.h, [
      AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /])
      ], [
diff --git a/sys/oss/gstossdmabuffer.c b/sys/oss/gstossdmabuffer.c
index 5db58465..5078d3c4 100644
--- a/sys/oss/gstossdmabuffer.c
+++ b/sys/oss/gstossdmabuffer.c
@@ -27,7 +27,21 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <sys/soundcard.h>
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
+
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <pthread.h>
diff --git a/sys/oss/gstosshelper.c b/sys/oss/gstosshelper.c
index 931d72c0..192a2068 100644
--- a/sys/oss/gstosshelper.c
+++ b/sys/oss/gstosshelper.c
@@ -33,7 +33,19 @@
 #include <errno.h>
 #include <string.h>
 
-#include <sys/soundcard.h>
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include <gst/interfaces/propertyprobe.h>
 
@@ -43,30 +55,6 @@
 GST_DEBUG_CATEGORY_EXTERN (oss_debug);
 #define GST_CAT_DEFAULT oss_debug
 
-#if 0
-
-#ifdef HAVE_OSS_INCLUDE_IN_SYS
-#include <sys/soundcard.h>
-#else
-
-#ifdef HAVE_OSS_INCLUDE_IN_ROOT
-#include <soundcard.h>
-#else
-
-#include <machine/soundcard.h>
-
-#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
-
-#endif /* HAVE_OSS_INCLUDE_IN_SYS */
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <glib.h>
-#endif /* 0 */
-
 typedef struct _GstOssProbe GstOssProbe;
 struct _GstOssProbe
 {
diff --git a/sys/oss/gstossmixer.c b/sys/oss/gstossmixer.c
index b1758d65..a5c8a35b 100644
--- a/sys/oss/gstossmixer.c
+++ b/sys/oss/gstossmixer.c
@@ -30,7 +30,20 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <sys/soundcard.h>
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include <gst/gst-i18n-plugin.h>
 
diff --git a/sys/oss/gstossmixertrack.c b/sys/oss/gstossmixertrack.c
index d98f345a..b8333864 100644
--- a/sys/oss/gstossmixertrack.c
+++ b/sys/oss/gstossmixertrack.c
@@ -30,7 +30,20 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <sys/soundcard.h>
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include <gst/gst-i18n-plugin.h>
 
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index 206de4c0..f44961b3 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -28,8 +28,20 @@
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/soundcard.h>
 
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include "gstosssink.h"
 
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index b0db3279..4ad6a63e 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -23,12 +23,26 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/soundcard.h>
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include "gstosssrc.h"
 
diff --git a/sys/oss/oss_probe.c b/sys/oss/oss_probe.c
index 5b0d1284..af624fa5 100644
--- a/sys/oss/oss_probe.c
+++ b/sys/oss/oss_probe.c
@@ -3,6 +3,7 @@
 #include "config.h"
 #endif
 
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -11,17 +12,17 @@
 #include <glib.h>
 
 #ifdef HAVE_OSS_INCLUDE_IN_SYS
-#include <sys/soundcard.h>
-#else
-
-#ifdef HAVE_OSS_INCLUDE_IN_ROOT
-#include <soundcard.h>
+# include <sys/soundcard.h>
 #else
-
-#include <machine/soundcard.h>
-
-#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
-
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
 #endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 typedef struct _Probe Probe;