Merge pull request #5119 from libgit2/ethomson/attr attr: rename constants and macros for consistency