Fix problem with default #defines
Cleanup compiler warning
2 files changed