Revert "Revert "Fix error with Xcode 6 and 64-bit compilation""
Merge pull request #21 from cbess/revert-20-revert-19-master

Put back "Fix error with Xcode 6 and 64-bit compilation""