Auto merge of #4713 - alexcrichton:fix-bsd, r=matklad
authorbors <bors@rust-lang.org>
Sun, 12 Nov 2017 18:23:21 +0000 (18:23 +0000)
committerbors <bors@rust-lang.org>
Sun, 12 Nov 2017 18:23:21 +0000 (18:23 +0000)
Fix compilation on more platforms


Trivial merge