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 /libmpdvdkit2 | |
| 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 'libmpdvdkit2')
| -rw-r--r-- | libmpdvdkit2/dvd_input.c | 6 | ||||
| -rw-r--r-- | libmpdvdkit2/dvd_input.h | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libmpdvdkit2/dvd_input.c b/libmpdvdkit2/dvd_input.c index 0709c71540..713ba98772 100644 --- a/libmpdvdkit2/dvd_input.c +++ b/libmpdvdkit2/dvd_input.c @@ -34,6 +34,12 @@ int (*DVDcss_title) (dvdcss_handle, int); int (*DVDcss_read) (dvdcss_handle, void *, int, int); char * (*DVDcss_error) (dvdcss_handle); +dvd_input_t (*DVDinput_open) (const char *); +int (*DVDinput_close) (dvd_input_t); +int (*DVDinput_seek) (dvd_input_t, int, int); +int (*DVDinput_title) (dvd_input_t, int); +int (*DVDinput_read) (dvd_input_t, void *, int, int); +char * (*DVDinput_error) (dvd_input_t); /* The DVDinput handle, add stuff here for new input methods. */ struct dvd_input_s { diff --git a/libmpdvdkit2/dvd_input.h b/libmpdvdkit2/dvd_input.h index 638d60aebf..8d95681956 100644 --- a/libmpdvdkit2/dvd_input.h +++ b/libmpdvdkit2/dvd_input.h @@ -36,12 +36,12 @@ typedef struct dvd_input_s *dvd_input_t; /** * Pointers which will be filled either the input meathods functions. */ -dvd_input_t (*DVDinput_open) (const char *); -int (*DVDinput_close) (dvd_input_t); -int (*DVDinput_seek) (dvd_input_t, int, int); -int (*DVDinput_title) (dvd_input_t, int); -int (*DVDinput_read) (dvd_input_t, void *, int, int); -char * (*DVDinput_error) (dvd_input_t); +extern dvd_input_t (*DVDinput_open) (const char *); +extern int (*DVDinput_close) (dvd_input_t); +extern int (*DVDinput_seek) (dvd_input_t, int, int); +extern int (*DVDinput_title) (dvd_input_t, int); +extern int (*DVDinput_read) (dvd_input_t, void *, int, int); +extern char * (*DVDinput_error) (dvd_input_t); /** * Setup function accessed by dvd_reader.c. Returns 1 if there is CSS support. |