#297603 use more .ifdef instead of commenting options