Fix win32 type warnings
Fix dumb type in time comparison
Merge pull request #1561 from arrbee/fix-windows-diff-eofnl

Fix windows diff eofnl error