diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-12 17:35:04 +0000 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-12 17:35:04 +0000 |
| commit | 0726b71ceb6edc21b85dda493cf7779fbae6168a (patch) | |
| tree | 44971ec3fe88f35c3c9f0407c1c34c0017246aac /sys | |
| parent | a8fa9f2b477cd6537ec0ddf9715654ba5e54b462 (diff) | |
ext/sys: Fix some compilation errors caused by circular includes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/oss/common.h | 2 | ||||
| -rw-r--r-- | sys/oss/gstossaudio.c | 1 | ||||
| -rw-r--r-- | sys/oss/gstosssrc.c | 2 | ||||
| -rw-r--r-- | sys/oss4/oss4-audio.h | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/sys/oss/common.h b/sys/oss/common.h index 8e05d0864..6c3632f26 100644 --- a/sys/oss/common.h +++ b/sys/oss/common.h @@ -18,6 +18,8 @@ * Boston, MA 02110-1301, USA. */ +#include <gst/audio/audio.h> + #define SET_PARAM(_oss, _name, _val, _detail) \ G_STMT_START { \ int _tmp = _val; \ diff --git a/sys/oss/gstossaudio.c b/sys/oss/gstossaudio.c index e6256b406..7194e2e84 100644 --- a/sys/oss/gstossaudio.c +++ b/sys/oss/gstossaudio.c @@ -23,6 +23,7 @@ #include "gst/gst-i18n-plugin.h" +#include "common.h" #include "gstosssink.h" #include "gstosssrc.h" diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index 3c9bb9b36..742c59dc4 100644 --- a/sys/oss/gstosssrc.c +++ b/sys/oss/gstosssrc.c @@ -59,8 +59,8 @@ # endif /* HAVE_OSS_INCLUDE_IN_ROOT */ #endif /* HAVE_OSS_INCLUDE_IN_SYS */ -#include "gstosssrc.h" #include "common.h" +#include "gstosssrc.h" #include <gst/gst-i18n-plugin.h> diff --git a/sys/oss4/oss4-audio.h b/sys/oss4/oss4-audio.h index 5581fe3b2..054ecf926 100644 --- a/sys/oss4/oss4-audio.h +++ b/sys/oss4/oss4-audio.h @@ -21,7 +21,7 @@ #define GST_OSS4_AUDIO_H_ #include <gst/gst.h> -#include <gst/audio/gstaudioringbuffer.h> +#include <gst/audio/audio.h> /* This is the minimum version we require */ #define GST_MIN_OSS4_VERSION 0x040003 |