This conflicts with ALIGN() from <sys/param.h>. Rather than trying
to excise <sys/param.h> from all of krb5, rename the macro.
Details
Details
- Reviewers
cy des - Group Reviewers
krb5 - Commits
- rGd1095367eb51: krb5: Rename the ALIGN macro in aestab.h
Diff Detail
Diff Detail
- Repository
- rG FreeBSD src repository
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
Comment Actions
this appears to fix the gcc build and should be acceptable upstream, so we can reduce our local diffs later. i haven't fully tested it because gcc buildworld is broken for other reasons right now.
Comment Actions
Please no. This is a gratuitous change that will cause merge conflict next vendor import. Unlike Heimdal that was imported once and never updated. We intend to update MIT KRB5 every upstream release. This change and more changes like this will accumulate to make me more work. Do not do commit this.
Comment Actions
On second thought we might not have the choice. <sigh>
| crypto/krb5/src/lib/crypto/builtin/aes/aestab.h | ||
|---|---|---|
| 91 | Please add a comment here for the next person importing an update what and why this change. People don't look at git logs when working on merge conflicts. | |
Comment Actions
the best way to avoid merge conflicts is to submit our local changes to MIT so they're in the next upstream release. however, we should wait until all the issues are fixed before doing that, so we're sure our changes are right...
Comment Actions
Note that the ALIGN and EXTERN macros are intended solely for internal use by this header, not for use in translation units that #include it, so when we submit this upstream, we should a) rename EXTERN as well, b) use a KRB5 prefix instead of AES, and c) #undef them at the end.