Remove deprecated macro names. Hopefully this will unbreak the

smooshlab build.  The breakage seems to be due to a collision
between LLVM's ATTRIBUTE_UNUSED and gcc's which was previously
hidden due to header files being included in a lucky order.

llvm-svn: 117260