Extend previous patch to cygwin 1.7.0.