fix warning about redefinition of macro