a couple of small fixes to support both i586-mingw32msvc-cc and i686-w64-mingw32-gcc