Fix for --disable-xdr
-Wshadow warning fix
Don't pollute other code with local macro definitions