am 6fd4de76: Merge "Fix Win32 <ziparchive/zip_archive.h>."

* commit '6fd4de76e05d98fa1fcbe07f579a715d61fbfbee':
  Fix Win32 <ziparchive/zip_archive.h>.