small cleanup for extra_info_t

CVS patchset: 3688
CVS date: 2002/12/27 02:03:06

4 files changed, 16 insertions, 14 deletions

diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h
index 383ee5e81..1367c6c3d 100644
--- a/src/xine-engine/audio_out.h
+++ b/src/xine-engine/audio_out.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_out.h,v 1.46 2002/12/26 21:53:42 miguelfreitas Exp $
+ * $Id: audio_out.h,v 1.47 2002/12/27 02:03:06 miguelfreitas Exp $
  */
 #ifndef HAVE_AUDIO_OUT_H
 #define HAVE_AUDIO_OUT_H
@@ -133,8 +133,9 @@ struct ao_driver_s {
 };
 
 /* to access extra_info_t contents one have to include xine_internal.h */
-#ifndef extra_info_t
-#define extra_info_t void
+#ifndef EXTRA_INFO
+#define EXTRA_INFO
+typedef struct extra_info_s extra_info_t;
 #endif
 
 typedef struct audio_fifo_s audio_fifo_t;
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index dad8752ae..a25d6179b 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer.h,v 1.87 2002/12/22 15:02:06 miguelfreitas Exp $
+ * $Id: buffer.h,v 1.88 2002/12/27 02:03:06 miguelfreitas Exp $
  *
  *
  * contents:
@@ -195,8 +195,9 @@ extern "C" {
 #define BUF_DEMUX_BLOCK		0x05000000
 
 /* to access extra_info_t contents one have to include xine_internal.h */
-#ifndef extra_info_t
-#define extra_info_t void
+#ifndef EXTRA_INFO
+#define EXTRA_INFO
+typedef struct extra_info_s extra_info_t;
 #endif
 
 typedef struct buf_element_s buf_element_t;
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index 008483fde..89a5ffbb0 100644
--- a/src/xine-engine/video_out.h
+++ b/src/xine-engine/video_out.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out.h,v 1.75 2002/12/26 21:53:42 miguelfreitas Exp $
+ * $Id: video_out.h,v 1.76 2002/12/27 02:03:06 miguelfreitas Exp $
  *
  *
  * xine version of video_out.h 
@@ -55,8 +55,9 @@ typedef struct video_overlay_instance_s video_overlay_instance_t;
 typedef struct vo_driver_s vo_driver_t;
 
 /* to access extra_info_t contents one have to include xine_internal.h */
-#ifndef extra_info_t
-#define extra_info_t void
+#ifndef EXTRA_INFO
+#define EXTRA_INFO
+typedef struct extra_info_s extra_info_t;
 #endif
 
 /* public part, video drivers may add private fields */
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index 5f8947147..3a0704da1 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_internal.h,v 1.116 2002/12/21 16:13:43 miguelfreitas Exp $
+ * $Id: xine_internal.h,v 1.117 2002/12/27 02:03:06 miguelfreitas Exp $
  *
  */
 
@@ -30,11 +30,10 @@ extern "C" {
 
 #include <inttypes.h>
 
-
-#ifdef extra_info_t
-#undef extra_info_t
+#ifndef EXTRA_INFO
+#define EXTRA_INFO
+typedef struct extra_info_s extra_info_t;
 #endif
-#define extra_info_t struct extra_info_s
 
 /*
  * include public part of xine header