ocl macro changes