Updated #ifdef with multiple conditions