Tidies up preprocessor definition's checking.
Merge pull request #11 from BSMaidSafe/next

Tidies up preprocessor definition's checking.