Also added SAFE macro's to OpenCL

and removed obsolete function declaration