Fix compile failure on MacOS X#1373

zedinosaur wants to merge 2 commits into

mobile-shell:mastermobile-shell/mosh:masterfrom

zedinosaur:macos-buildfixzedinosaur/mosh:macos-buildfixCopy head branch name to clipboard