summaryrefslogtreecommitdiff
path: root/secblock.h
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2020-12-19 19:43:45 -0500
committerJeffrey Walton <noloader@gmail.com>2020-12-19 19:43:45 -0500
commitb08495b4ec45e7838e2ce1ef88a22117678dd555 (patch)
tree5ee9311a07bbfca6e9d1132066bd40cfcacbea64 /secblock.h
parent0c11426b3524f402660e4d2653725da0ad064e8e (diff)
downloadcryptopp-git-b08495b4ec45e7838e2ce1ef88a22117678dd555.tar.gz
Fix use of CRYPTOPP_BOOL_ALIGN16 (GH #982)
Diffstat (limited to 'secblock.h')
-rw-r--r--secblock.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/secblock.h b/secblock.h
index 5045ad69..e74b19a8 100644
--- a/secblock.h
+++ b/secblock.h
@@ -486,7 +486,7 @@ public:
private:
-#if defined(CRYPTOPP_BOOL_ALIGN16) && (defined(_M_X64) || defined(__x86_64__))
+#if CRYPTOPP_BOOL_ALIGN16 && (defined(_M_X64) || defined(__x86_64__))
// Before we can add additional platforms we need to check the
// linker documentation for alignment behavior for stack variables.
// CRYPTOPP_ALIGN_DATA(16) is known OK on Linux, OS X, Solaris.
@@ -497,7 +497,7 @@ private:
}
CRYPTOPP_ALIGN_DATA(16) T m_array[S];
-#elif defined(CRYPTOPP_BOOL_ALIGN16)
+#elif CRYPTOPP_BOOL_ALIGN16
// There be demons here... We cannot use CRYPTOPP_ALIGN_DATA(16)
// because linkers on 32-bit machines (and some 64-bit machines)
@@ -539,7 +539,7 @@ private:
// CRYPTOPP_BOOL_ALIGN16 is 0. Use natural alignment of T.
T* GetAlignedArray() {return m_array;}
- CRYPTOPP_ALIGN_DATA(4) T m_array[S];
+ T m_array[S];
#endif