Warning fixes

Fixed some inoffensive warnings when building with clang.
* warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]
* warning: '_COMMENTCNV_H' is used as a header guard here, followed by #define of a different macro [-Wheader-guard]