Merge pull request #739 from dankex/fix_mac
authorKim Kulling <kimkulling@users.noreply.github.com>
Sat, 2 Jan 2016 10:35:27 +0000 (11:35 +0100)
committerKim Kulling <kimkulling@users.noreply.github.com>
Sat, 2 Jan 2016 10:35:27 +0000 (11:35 +0100)
Fix compilation error for Mac OS X and 64-bit architecture


Trivial merge