remove unused macros
Merge pull request #2680 from adrians:remove_cv_err