Commit fc270aab authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

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).
parent c28f84c0
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:
......
......@@ -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 /])
], [
......
......@@ -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>
......
......@@ -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
{
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -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"
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment