diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-09 18:21:04 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-09 18:21:04 +0200 |
| commit | f36b9d822626dbbaf585e70cfa7ea60aa6d194af (patch) | |
| tree | 220b7a7d185f262dc793c14c92a77ea615950d86 /src/input/input_vcd.c | |
| parent | b6055c5fe61d918259d1c253aa32fa97dd3e5163 (diff) | |
| parent | d5d3776bf7e2733d382c5811b317bcdb7c2c9e88 (diff) | |
| download | xine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.gz xine-lib-f36b9d822626dbbaf585e70cfa7ea60aa6d194af.tar.bz2 | |
Merge with 1.2 branch.
Diffstat (limited to 'src/input/input_vcd.c')
| -rw-r--r-- | src/input/input_vcd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index bcd50ecc1..7d2ea0063 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -340,9 +340,10 @@ static int sun_vcd_read(vcd_input_plugin_t *this, long lba, cdsector_t *data) #if defined (__linux__) static off_t vcd_plugin_read (input_plugin_t *this_gen, - char *buf, off_t nlen) { + void *buf_gen, off_t nlen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; + char *buf = (char *)buf_gen; static struct cdrom_msf msf ; static cdsector_t data; struct cdrom_msf0 *end_msf; @@ -398,8 +399,9 @@ static off_t vcd_plugin_read (input_plugin_t *this_gen, } #elif defined (__FreeBSD__) static off_t vcd_plugin_read (input_plugin_t *this_gen, - char *buf, off_t nlen) { + void *buf_gen, off_t nlen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; + char *buf = (char *)buf_gen; static cdsector_t data; int bsize = 2352; @@ -422,9 +424,10 @@ static off_t vcd_plugin_read (input_plugin_t *this_gen, } #elif defined (__sun) static off_t vcd_plugin_read (input_plugin_t *this_gen, - char *buf, off_t nlen) { + void *buf_gen, off_t nlen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; + char *buf = (char *)buf_gen; static cdsector_t data; struct cdrom_msf0 *end_msf; long lba; |