Merge pull request #1010 from bdring/FixMacros #150

Job	Run time
tests (ubuntu-latest, tests)	49s
tests (macos-latest, tests)	2m 45s
tests (windows-latest, tests_nosan)	4m 2s
build (ubuntu-latest, noradio)	2m 52s
build (ubuntu-latest, wifi)	3m 31s
build (ubuntu-latest, bt)	2m 28s
build (macos-latest, noradio)	2m 40s
build (macos-latest, wifi)	3m 21s
build (macos-latest, bt)	2m 45s
build (windows-latest, noradio)	6m 11s
build (windows-latest, wifi)	5m 31s
build (windows-latest, bt)	5m 38s
	42m 33s

Provide feedback