RJK's OS X portability patch: