fixed warning about redefined macro