Detect 64bit using proper macros
Merge pull request #142 from dwimsey/bugfix-64bit

Detect 64bit using proper macros