Fix some OpenCL kernel file build errors on Mac.
Merge pull request #923 from pengx17:2.4_macfix