Merge branch 'v0.20.x'

2017-12-16 20:50:53 +01:00
parent fbc4bb29dc f1ef9f9d31
commit 6246d36fe6
105 changed files with 270 additions and 240 deletions
--- a/src/decoder/plugins/FlacIOHandle.cxx
+++ b/src/decoder/plugins/FlacIOHandle.cxx
@@ -46,7 +46,7 @@ FlacIORead(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)

 			p += nbytes;

-#ifndef WIN32
+#ifndef _WIN32
 		} catch (const std::system_error &e) {
 			errno = e.code().category() == ErrnoCategory()
 				? e.code().value()