Bug 3605401: Compiler error with latest mingw-w64 headers
[Bug 3605401]: Compiler error with latest mingw-w64 headers.
[Bug 3605401]: Compiler error with latest mingw-w64 headers.
merge trunk