Make #if conditions in PSM compliant with CPP#138

nagisa merged 2 commits intorust-lang:masterrust-lang/stacker:masterfrom

adsnaider:psm_cfgs_compliant_cppadsnaider/stacker:psm_cfgs_compliant_cppCopy head branch name to clipboard