Bug 960517 - Don't use DOS file encoding.
Bug 974318 - GCC fixup
Bug 928351 - Fixed -Wshadow warning.