Cleanup discrepancies between r5178 and r5251. This version should work well now. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5258 4407c894-4637-0410-b4f5-ada5f102cad1