diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-03-14 18:22:29 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-03-14 18:22:37 +1100 |
| commit | f25b2602dce3c09098e3092bfad983e3ec7fdb4f (patch) | |
| tree | ca2eba807a5d839dc3f817ab71e0a4486b0f0682 /src/test_libFLAC | |
| parent | 6497ce19770ec48d565f3a043cc74c9c389c7829 (diff) | |
| download | flac-f25b2602dce3c09098e3092bfad983e3ec7fdb4f.tar.gz | |
Fix a couple of Windows 2Gig file size issues.
Patch submitted by Janne Hyvärinen <cse@sci.fi>.
Diffstat (limited to 'src/test_libFLAC')
| -rw-r--r-- | src/test_libFLAC/decoders.c | 6 | ||||
| -rw-r--r-- | src/test_libFLAC/encoders.c | 6 | ||||
| -rw-r--r-- | src/test_libFLAC/metadata_manip.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/test_libFLAC/decoders.c b/src/test_libFLAC/decoders.c index d913f0a1..c9d2cdf3 100644 --- a/src/test_libFLAC/decoders.c +++ b/src/test_libFLAC/decoders.c @@ -57,7 +57,7 @@ typedef struct { static FLAC__StreamMetadata streaminfo_, padding_, seektable_, application1_, application2_, vorbiscomment_, cuesheet_, picture_, unknown_; static FLAC__StreamMetadata *expected_metadata_sequence_[9]; static unsigned num_expected_; -static off_t flacfilesize_; +static FLAC__off_t flacfilesize_; static const char *flacfilename(FLAC__bool is_ogg) { @@ -164,7 +164,7 @@ static FLAC__StreamDecoderSeekStatus stream_decoder_seek_callback_(const FLAC__S if(dcd->error_occurred) return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR; - if(fseeko(dcd->file, (off_t)absolute_byte_offset, SEEK_SET) < 0) { + if(fseeko(dcd->file, (FLAC__off_t)absolute_byte_offset, SEEK_SET) < 0) { dcd->error_occurred = true; return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR; } @@ -175,7 +175,7 @@ static FLAC__StreamDecoderSeekStatus stream_decoder_seek_callback_(const FLAC__S static FLAC__StreamDecoderTellStatus stream_decoder_tell_callback_(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) { StreamDecoderClientData *dcd = (StreamDecoderClientData*)client_data; - off_t offset; + FLAC__off_t offset; (void)decoder; diff --git a/src/test_libFLAC/encoders.c b/src/test_libFLAC/encoders.c index d05c6745..8ed55f68 100644 --- a/src/test_libFLAC/encoders.c +++ b/src/test_libFLAC/encoders.c @@ -120,7 +120,7 @@ static FLAC__StreamEncoderSeekStatus stream_encoder_seek_callback_(const FLAC__S { FILE *f = (FILE*)client_data; (void)encoder; - if(fseek(f, (long)absolute_byte_offset, SEEK_SET) < 0) + if(fseeko(f, (long)absolute_byte_offset, SEEK_SET) < 0) return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR; else return FLAC__STREAM_ENCODER_SEEK_STATUS_OK; @@ -129,9 +129,9 @@ static FLAC__StreamEncoderSeekStatus stream_encoder_seek_callback_(const FLAC__S static FLAC__StreamEncoderTellStatus stream_encoder_tell_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) { FILE *f = (FILE*)client_data; - long pos; + FLAC__off_t pos; (void)encoder; - if((pos = ftell(f)) < 0) + if((pos = ftello(f)) < 0) return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR; else { *absolute_byte_offset = (FLAC__uint64)pos; diff --git a/src/test_libFLAC/metadata_manip.c b/src/test_libFLAC/metadata_manip.c index e7200567..ea51d172 100644 --- a/src/test_libFLAC/metadata_manip.c +++ b/src/test_libFLAC/metadata_manip.c @@ -279,7 +279,7 @@ static size_t chain_write_cb_(const void *ptr, size_t size, size_t nmemb, FLAC__ static int chain_seek_cb_(FLAC__IOHandle handle, FLAC__int64 offset, int whence) { - off_t o = (off_t)offset; + FLAC__off_t o = (FLAC__off_t)offset; FLAC__ASSERT(offset == o); return fseeko((FILE*)handle, o, whence); } |