remove #undefs in trap.c