summaryrefslogtreecommitdiffstats
path: root/sys/oss/gstosshelper.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/oss/gstosshelper.c')
-rw-r--r--sys/oss/gstosshelper.c38
1 files changed, 13 insertions, 25 deletions
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
{