monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 12:39:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #5250

Browse source 
a48e49aa aesb: avoid stomping on an existing define on NetBSD (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-03-21 14:47:10 +02:00
commit 56feda84d3
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/crypto/aesb.c
View file

@ -33,11 +33,11 @@ extern "C"
#define RC_LENGTH (5 * (AES_BLOCK_SIZE / 4 - 2)) #define RC_LENGTH (5 * (AES_BLOCK_SIZE / 4 - 2))
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define ALIGN __declspec(align(TABLE_ALIGN)) #define LOCAL_ALIGN __declspec(align(TABLE_ALIGN))
#elif defined(__GNUC__) #elif defined(__GNUC__)
#define ALIGN __attribute__ ((aligned(16))) #define LOCAL_ALIGN __attribute__ ((aligned(16)))
#else #else
#define ALIGN #define LOCAL_ALIGN
#endif #endif
#define rf1(r,c) (r) #define rf1(r,c) (r)
@ -131,7 +131,7 @@ extern "C"
#define t_set(m,n) t_##m##n #define t_set(m,n) t_##m##n
#define t_use(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) \ #define four_tables(x,tab,vf,rf,c) \
(tab[0][bval(vf(x,0,c),rf(0,c))] \ (tab[0][bval(vf(x,0,c),rf(0,c))] \