Merge pull request #1680 from jonesmz/patch-1

Fix invalid preprocessor #if