Actually remove definitions of DEFINE_NON_INLINE_P and DEFINE_INLINE_P

I applied the patch "Do not expand macros to 'defined'" by hand because
I couldn't apply it with git-am, and of course forgot to remove the
macro definitions.  This patch fixes it, and also makes the ChangeLog
entry a bit cleaner.