(zlib) More build fixes for MSVC