[cvs-nhc98] patch applied (york-compiler98): remove cpp #ifdefs