diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-07-03 18:15:56 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-07-03 18:15:56 -0700 |
| commit | 6d398beefddb48d91f27e5f41bf39f40eb77222f (patch) | |
| tree | 2aa6dfcf8dd121e61c12c3481adbe000a822516f /node/Salsa20.hpp | |
| parent | ab34884e3e47eb611d42312eb05079119f62e8b8 (diff) | |
| parent | 532f41347221668144f30dd1427de49f1925d2b8 (diff) | |
| download | infinitytier-6d398beefddb48d91f27e5f41bf39f40eb77222f.tar.gz infinitytier-6d398beefddb48d91f27e5f41bf39f40eb77222f.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Salsa20.hpp')
| -rw-r--r-- | node/Salsa20.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |