Macosx uses a different layout for struct flock.
Merge pull request #821 from ktf/fix-xdaq-removal-macosx

Macosx uses a different layout for struct flock.