diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-21 14:47:10 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-21 14:47:11 +0200 |
| commit | 56feda84d31f6745c84dd272656c8286f198621d (patch) | |
| tree | 12fb1225732c2df8b06c667ee35e6ce1e7e37fd2 /src | |
| parent | Merge pull request #5248 (diff) | |
| parent | aesb: avoid stomping on an existing define on NetBSD (diff) | |
| download | monero-56feda84d31f6745c84dd272656c8286f198621d.tar.xz | |
Merge pull request #5250
a48e49aa aesb: avoid stomping on an existing define on NetBSD (moneromooo-monero)
Diffstat (limited to 'src')
| -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))] \ |