And here comes a new patch to fix the Cygwin build: