modify macro : x.cl and macro.h