More OSX build fixes

[Jouni Malinen]

On Tue, Sep 22, 2015 at 11:26:58AM -0400, Alan DeKok wrote:
>   These should be simple enough.

Thanks, applied.

-- 
Jouni Malinen                                            PGP id EFC895FA