Fix Mac build, patch #1091 by Humberto Diogenes.
8 files changed