No longer link Cygwin executables with zlib1.dll, but with cygz.dll. 
On Cygwin64 this doesn't work, and on Cygwin32 it was a bad idea anyway.
merge trunk. 
remove some unneeded #undef's