Fixed -Wundef warnings
Merge pull request #516 from dmaclach/master

Fixed -Wundef warnings