Apple: Some changes to fix compilation problems on OSX
2 files changed