diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-08-02 06:25:02 +0100 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-08-02 06:30:17 +0100 |
| commit | d1095367eb5116a0b9a1b9fb6eb913a77eeb5e5d (patch) | |
| tree | 58ecf6e33a54a2cbe9cb178d7861edadb68a8aac /crypto | |
| parent | ac641d55ea0622f06baa60b9d22ef4880007d8c4 (diff) | |
krb5: Rename the ALIGN macro in aestab.h
This conflicts with ALIGN() from <sys/param.h>. Rather than trying
to excise <sys/param.h> from all of krb5, rename the macro.
Reviewed by: des (previous version), cy
Differential Revision: https://reviews.freebsd.org/D51574
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/krb5/src/lib/crypto/builtin/aes/aestab.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/crypto/krb5/src/lib/crypto/builtin/aes/aestab.h b/crypto/krb5/src/lib/crypto/builtin/aes/aestab.h index 8fe32d1800d6..87d7097ba0ec 100644 --- a/crypto/krb5/src/lib/crypto/builtin/aes/aestab.h +++ b/crypto/krb5/src/lib/crypto/builtin/aes/aestab.h @@ -86,10 +86,11 @@ extern "C" { # define EXTERN extern #endif +/* Renamed from ALIGN in MIT source to avoid a conflict with machine/param.h */ #if defined(_MSC_VER) && defined(TABLE_ALIGN) -#define ALIGN __declspec(align(TABLE_ALIGN)) +#define AES_ALIGN __declspec(align(TABLE_ALIGN)) #else -#define ALIGN +#define AES_ALIGN #endif #if defined( __WATCOMC__ ) && ( __WATCOMC__ >= 1100 ) @@ -99,13 +100,13 @@ extern "C" { #endif #if defined(DO_TABLES) && defined(STATIC_TABLES) -#define d_1(t,n,b,e) EXTERN ALIGN CONST XP_DIR t n[256] = b(e) -#define d_4(t,n,b,e,f,g,h) EXTERN ALIGN CONST XP_DIR t n[4][256] = { b(e), b(f), b(g), b(h) } -EXTERN ALIGN CONST uint32_t t_dec(r,c)[RC_LENGTH] = rc_data(w0); +#define d_1(t,n,b,e) EXTERN AES_ALIGN CONST XP_DIR t n[256] = b(e) +#define d_4(t,n,b,e,f,g,h) EXTERN AES_ALIGN CONST XP_DIR t n[4][256] = { b(e), b(f), b(g), b(h) } +EXTERN AES_ALIGN CONST uint32_t t_dec(r,c)[RC_LENGTH] = rc_data(w0); #else -#define d_1(t,n,b,e) EXTERN ALIGN CONST XP_DIR t n[256] -#define d_4(t,n,b,e,f,g,h) EXTERN ALIGN CONST XP_DIR t n[4][256] -EXTERN ALIGN CONST uint32_t t_dec(r,c)[RC_LENGTH]; +#define d_1(t,n,b,e) EXTERN AES_ALIGN CONST XP_DIR t n[256] +#define d_4(t,n,b,e,f,g,h) EXTERN AES_ALIGN CONST XP_DIR t n[4][256] +EXTERN AES_ALIGN CONST uint32_t t_dec(r,c)[RC_LENGTH]; #endif #if defined( SBX_SET ) |