diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-09-08 20:39:16 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-09-08 20:39:48 +1000 |
| commit | 23f6a35996ddcc33b6cdbe2fdd563f15c214b1a9 (patch) | |
| tree | d68e20f47536eba7cb6fe28d2ede1affc857b90a | |
| parent | a52177b0d1e79c5cc15ab7d3503bcd1bfb3fd54b (diff) | |
| download | flac-23f6a35996ddcc33b6cdbe2fdd563f15c214b1a9.tar.gz | |
Fix compiler warning from gcc-6.1.1
| -rw-r--r-- | src/flac/decode.c | 3 | ||||
| -rw-r--r-- | src/libFLAC/cpu.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/flac/decode.c b/src/flac/decode.c index 3a6997b7..5c145a99 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -1408,9 +1408,10 @@ void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderError { DecoderSession *decoder_session = (DecoderSession*)client_data; (void)decoder; - if(!decoder_session->error_callback_suppress_messages) + if(!decoder_session->error_callback_suppress_messages) { stats_print_name(1, decoder_session->inbasefilename); flac__utils_printf(stderr, 1, "*** Got error code %d:%s\n", status, FLAC__StreamDecoderErrorStatusString[status]); + } if(!decoder_session->continue_through_decode_errors) { /* if we got a sync error while looking for metadata, either it's not a FLAC file (more likely) or the file is corrupted */ if( diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c index a9715e3d..33e4bd27 100644 --- a/src/libFLAC/cpu.c +++ b/src/libFLAC/cpu.c @@ -74,11 +74,13 @@ /* these are flags in EDX of CPUID AX=00000001 */ +#if defined FLAC__CPU_IA32 static const unsigned FLAC__CPUINFO_IA32_CPUID_CMOV = 0x00008000; static const unsigned FLAC__CPUINFO_IA32_CPUID_MMX = 0x00800000; static const unsigned FLAC__CPUINFO_IA32_CPUID_FXSR = 0x01000000; static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE = 0x02000000; static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE2 = 0x04000000; +#endif /* these are flags in ECX of CPUID AX=00000001 */ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE3 = 0x00000001; |