From f19c3c51d3ca2bc886a9125aa9b187aa794b1676 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 2 Jul 2015 09:00:00 -0700 Subject: Revert slow non-SSE Salsa20 modification since it did not fix Android/ARM issue. Also update Salsa20 comments and clean up a bit. --- node/Salsa20.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'node/Salsa20.hpp') diff --git a/node/Salsa20.hpp b/node/Salsa20.hpp index 9631a6db..3bb041ac 100644 --- a/node/Salsa20.hpp +++ b/node/Salsa20.hpp @@ -78,7 +78,7 @@ public: } private: - volatile union { + union { #ifdef ZT_SALSA20_SSE __m128i v[4]; #endif // ZT_SALSA20_SSE -- cgit v1.2.3