Revert "fix Wshadow warnings in glm"

Only works with some versions and seems to break with cygwin. I'm
working on using a recent upstream version + patches.

This reverts commit 848f165ceb54b0c7ae3e52ad7ad50c258db2956c.