diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-03-07 16:08:00 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-03-07 16:08:00 +0000 |
| commit | a48e49aa36a4d32a703b01c6d2c5f6b41bc7919e (patch) | |
| tree | 924c44f0841696237fcf597f2e79bfdd2a3cab2c /src/crypto/aesb.c | |
| parent | Merge pull request #4852 (diff) | |
| download | monero-a48e49aa36a4d32a703b01c6d2c5f6b41bc7919e.tar.xz | |
aesb: avoid stomping on an existing define on NetBSD
Diffstat (limited to 'src/crypto/aesb.c')
| -rw-r--r-- | src/crypto/aesb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/crypto/aesb.c b/src/crypto/aesb.c index efdeef8d1..6d4905ad5 100644 --- a/src/crypto/aesb.c +++ b/src/crypto/aesb.c @@ -33,11 +33,11 @@ extern "C" #define RC_LENGTH (5 * (AES_BLOCK_SIZE / 4 - 2)) #if defined(_MSC_VER) -#define ALIGN __declspec(align(TABLE_ALIGN)) +#define LOCAL_ALIGN __declspec(align(TABLE_ALIGN)) #elif defined(__GNUC__) -#define ALIGN __attribute__ ((aligned(16))) +#define LOCAL_ALIGN __attribute__ ((aligned(16))) #else -#define ALIGN +#define LOCAL_ALIGN #endif #define rf1(r,c) (r) @@ -131,7 +131,7 @@ extern "C" #define t_set(m,n) t_##m##n #define t_use(m,n) t_##m##n -#define d_4(t,n,b,e,f,g,h) ALIGN const t n[4][256] = { b(e), b(f), b(g), b(h) } +#define d_4(t,n,b,e,f,g,h) LOCAL_ALIGN const t n[4][256] = { b(e), b(f), b(g), b(h) } #define four_tables(x,tab,vf,rf,c) \ (tab[0][bval(vf(x,0,c),rf(0,c))] \ |