Preprocessor update

— Fix the interpretation of @#else clause within an @#ifndef (#1747)
— Fix the interpretation of @#elseif clauses within an @#ifdef or @#ifndef