[cvs-nhc98] patch applied (york-compiler98): Port the recent change to cpphs vs Yhc into the NYHC branch