fix all redefine build errors on some Intel OCL
Merge pull request #775 from bitwangyaoyao:2.4_fixerr