summaryrefslogtreecommitdiff
path: root/node/Salsa20.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'node/Salsa20.hpp')
-rw-r--r--node/Salsa20.hpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/node/Salsa20.hpp b/node/Salsa20.hpp
index 6e485bac..0c1f3be4 100644
--- a/node/Salsa20.hpp
+++ b/node/Salsa20.hpp
@@ -13,14 +13,7 @@
#ifdef ZT_SALSA20_SSE
#include <emmintrin.h>
-#ifdef __GCC__
-#define ZT_SALSA20_SSE_ALIGN __attribute__((aligned (16)))
-#else
-#define ZT_SALSA20_SSE_ALIGN __declspec(align(16))
-#endif
-#else
-#define ZT_SALSA20_SSE_ALIGN
-#endif
+#endif // ZT_SALSA20_SSE
namespace ZeroTier {
@@ -79,10 +72,10 @@ public:
}
private:
- volatile ZT_SALSA20_SSE_ALIGN union {
+ volatile union {
#ifdef ZT_SALSA20_SSE
__m128i v[4];
-#endif
+#endif // ZT_SALSA20_SSE
uint32_t i[16];
} _state;
unsigned int _roundsDiv2;