ca49f12fdb
and trim another unneeded #ifdef (it was just around a macro that is already conditionally defined).
and trim another unneeded #ifdef (it was just around a macro that is already conditionally defined).