Compatibility fixes

Conflicts:
	blurt_cpp_80211/Makefile.osx