fix OS X enum clash
Merge pull request #100 from mdoege/osx

fix OS X enum clash
fix c29d31c - fix OS X enum clash
Disallow use [] on shared lock
Merge remote-tracking branch 'upstream/master' into next