[MPlayer-cvslog] CVS: main/libmpdemux tv.c, 1.70, 1.71 tv.h, 1.29, 1.30

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv10281/libmpdemux

Modified Files:
	tv.c tv.h 
Log Message:
several sets of headers declare global variables in them, which causes multiple definition errors with gcc 4.x
patch by Alexander Strange <astrange ithinksw.com>


Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- tv.c	27 Dec 2004 19:43:13 -0000	1.70
+++ tv.c	29 Jan 2005 12:24:43 -0000	1.71
@@ -78,6 +78,9 @@
 int tv_param_contrast = 0;
 int tv_param_hue = 0;
 int tv_param_saturation = 0;
+tv_channels_t *tv_channel_list;
+tv_channels_t *tv_channel_current, *tv_channel_last;
+char *tv_channel_last_real;
 
 /* ================== DEMUX_TV ===================== */
 /*

Index: tv.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tv.h	19 Nov 2004 13:04:24 -0000	1.29
+++ tv.h	29 Jan 2005 12:24:43 -0000	1.30
@@ -95,9 +95,9 @@
     struct tv_channels_s *prev;
 } tv_channels_t;
 
-tv_channels_t *tv_channel_list;
-tv_channels_t *tv_channel_current, *tv_channel_last;
-char *tv_channel_last_real;
+extern tv_channels_t *tv_channel_list;
+extern tv_channels_t *tv_channel_current, *tv_channel_last;
+extern char *tv_channel_last_real;
 
 #define TVI_CONTROL_FALSE		0
 #define TVI_CONTROL_TRUE		1