r22226: move discard_const macros to librelace