replaced expressions using preprocessor definitions