Fix clockid_t typedef redefinition compile error on Darwin

Merged Sergio Ammirata requested to merge osx_fix into master

Merge request reports