From fc270aab7973d70841134fe8ad511312cc33de4f Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Sat, 10 Dec 2005 14:57:48 +0000
Subject: 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).
---
 sys/oss/gstosshelper.c | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

(limited to 'sys/oss/gstosshelper.c')

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
 {
-- 
cgit