From 2c01b285c1232dc1127359bed0c49fd969aaf79f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 14 Jan 2007 04:25:24 +0000 Subject: flac: workaround for type inconsistency between new/old read callback size_t (1.1.3) makes a lot more sense, but older flac used unsigned here... git-svn-id: https://svn.musicpd.org/mpd/trunk@5258 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/inputPlugins/_flac_common.h | 2 ++ src/inputPlugins/flac_plugin.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/inputPlugins') diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h index 8b53a42df..9e851ad9d 100644 --- a/src/inputPlugins/_flac_common.h +++ b/src/inputPlugins/_flac_common.h @@ -51,6 +51,7 @@ # define flac_decoder_eof FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM +typedef unsigned flac_read_status_size_t; # define flac_read_status FLAC__SeekableStreamDecoderReadStatus # define flac_read_status_continue \ FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK @@ -112,6 +113,7 @@ # define flac_decoder_eof FLAC__STREAM_DECODER_END_OF_STREAM +typedef size_t flac_read_status_size_t; # define flac_read_status FLAC__StreamDecoderReadStatus # define flac_read_status_continue \ FLAC__STREAM_DECODER_READ_STATUS_CONTINUE diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c index 627bca6f6..b48e5e73f 100644 --- a/src/inputPlugins/flac_plugin.c +++ b/src/inputPlugins/flac_plugin.c @@ -37,7 +37,7 @@ static flac_read_status flacRead(const flac_decoder * flacDec, FLAC__byte buf[], - unsigned *bytes, + flac_read_status_size_t *bytes, void *fdata) { FlacData *data = (FlacData *) fdata; -- cgit v1.2.3