From 848fe719fb96ede87dd4c19e8c1f6d0c1fb267f0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 22 Sep 2017 04:56:58 +0200 Subject: [PATCH] Some CXX_BUILD fixes --- deps/libFLAC/bitreader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/libFLAC/bitreader.c b/deps/libFLAC/bitreader.c index ab62d414f3..b7607af178 100644 --- a/deps/libFLAC/bitreader.c +++ b/deps/libFLAC/bitreader.c @@ -226,7 +226,7 @@ static FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br) FLAC__BitReader *FLAC__bitreader_new(void) { - FLAC__BitReader *br = calloc(1, sizeof(FLAC__BitReader)); + FLAC__BitReader *br = (FLAC__BitReader*)calloc(1, sizeof(FLAC__BitReader)); /* calloc() implies: memset(br, 0, sizeof(FLAC__BitReader)); @@ -258,10 +258,10 @@ FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__BitReaderReadCallback { FLAC__ASSERT(0 != br); - br->words = br->bytes = 0; + br->words = br->bytes = 0; br->consumed_words = br->consumed_bits = 0; - br->capacity = FLAC__BITREADER_DEFAULT_CAPACITY; - br->buffer = malloc(sizeof(brword) * br->capacity); + br->capacity = FLAC__BITREADER_DEFAULT_CAPACITY; + br->buffer = (brword*)malloc(sizeof(brword) * br->capacity); if(br->buffer == 0) return false; br->read_callback = rcb;