Merge "Fix ifdef, its operand is literal variable name"