Added fix for htonll conflict on OSX Yosemite.