diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-29 12:24:43 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-29 12:24:43 +0000 |
| commit | 80d8313b709dd356f9dfdb3303da4611eda0a911 (patch) | |
| tree | 5b477f3037996e743ad398793bf222ed0b47b371 /libmpdemux | |
| parent | 20817ae85ed85a79a4436699aebf6fd843b83242 (diff) | |
| download | mpv-80d8313b709dd356f9dfdb3303da4611eda0a911.tar.bz2 mpv-80d8313b709dd356f9dfdb3303da4611eda0a911.tar.xz | |
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>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14608 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/tv.c | 3 | ||||
| -rw-r--r-- | libmpdemux/tv.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index 13fdb269e1..d12a317987 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -78,6 +78,9 @@ int tv_param_brightness = 0; 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 ===================== */ /* diff --git a/libmpdemux/tv.h b/libmpdemux/tv.h index c0ac37cce6..df57161ade 100644 --- a/libmpdemux/tv.h +++ b/libmpdemux/tv.h @@ -95,9 +95,9 @@ typedef struct tv_channels_s { 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 |