From 73df7f99ea1a60912b7aae77092458a6c1807235 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Sat, 3 Jan 2004 12:53:44 +0000
Subject: [PATCH] ext/: OS X fixes (see #126628).

Original commit message from CVS:
2004-01-03  Ronald Bultje  <rbultje@ronald.bitfreak.net>

* ext/flac/gstflacdec.c:
* ext/libpng/gstpngenc.h:
* ext/mikmod/gstmikmod.h:
OS X fixes (see #126628).
---
 ChangeLog              |  7 +++++++
 ext/flac/gstflacdec.c  |  1 -
 ext/libpng/gstpngenc.h |  2 +-
 ext/mikmod/gstmikmod.h | 10 +++++-----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c988f937a1..652d86e0c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-03  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/flac/gstflacdec.c:
+	* ext/libpng/gstpngenc.h:
+	* ext/mikmod/gstmikmod.h:
+	  OS X fixes (see #126628).
+
 2004-01-02  David Schleef  <ds@schleef.org>
 
 	* ext/alsa/gstalsasrc.c: (gst_alsa_src_pad_factory),
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 5b893d66ab..ae2ae6674a 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 #include <string.h>
-#include <sys/soundcard.h>
 
 /*#define DEBUG_ENABLED */
 #include "gstflacdec.h"
diff --git a/ext/libpng/gstpngenc.h b/ext/libpng/gstpngenc.h
index fcda16fb67..59bc4ab4fd 100644
--- a/ext/libpng/gstpngenc.h
+++ b/ext/libpng/gstpngenc.h
@@ -38,7 +38,7 @@ extern "C" {
 typedef struct _GstPngEnc GstPngEnc;
 typedef struct _GstPngEncClass GstPngEncClass;
 
-GstPadTemplate *pngenc_src_template, *pngenc_sink_template;
+extern GstPadTemplate *pngenc_src_template, *pngenc_sink_template;
 
 struct _GstPngEnc
 {
diff --git a/ext/mikmod/gstmikmod.h b/ext/mikmod/gstmikmod.h
index 9d5db8a52c..8af87a27c3 100644
--- a/ext/mikmod/gstmikmod.h
+++ b/ext/mikmod/gstmikmod.h
@@ -72,11 +72,11 @@ struct _GstMikModClass {
 typedef struct _GstMikMod GstMikMod;
 typedef struct _GstMikModClass GstMikModClass;
 
-MODULE *module;
-MREADER *reader;
-GstPad *srcpad;
-gint64 timestamp;
-int need_sync;
+extern MODULE *module;
+extern MREADER *reader;
+extern GstPad *srcpad;
+extern gint64 timestamp;
+extern int need_sync;
 
 GType gst_mikmod_get_type(void);