fix macro conflicts with latest version of libtrace