Fixed the build issue by removing && and moving into ifdef and ifndef statements

1 file changed