From 31ebabeb1ee8961b90b4f771999d564fa563766a Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sat, 18 Aug 2018 07:21:42 -0400
Subject: [PATCH] Cleanup headers in vmac.cpp

---
 config.h |  2 +-
 vmac.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config.h b/config.h
index 03368f5b..2d4f970f 100644
--- a/config.h
+++ b/config.h
@@ -593,7 +593,7 @@ NAMESPACE_END
 // ***************** ARM CPU features ********************
 
 #if (CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARM64)
-	
+
 // We don't have an ARM big endian test rig. Disable
 // ARM-BE ASM and instrinsics until we can test it.
 #if defined(CRYPTOPP_BIG_ENDIAN)
diff --git a/vmac.cpp b/vmac.cpp
index 0cfc1a87..8312854b 100644
--- a/vmac.cpp
+++ b/vmac.cpp
@@ -9,6 +9,10 @@
 #include "argnames.h"
 #include "secblock.h"
 
+#if defined(_MSC_VER) && !CRYPTOPP_BOOL_SLOW_WORD64
+#include <intrin.h>
+#endif
+
 #if defined(CRYPTOPP_DISABLE_VMAC_ASM)
 # undef CRYPTOPP_X86_ASM_AVAILABLE
 # undef CRYPTOPP_X32_ASM_AVAILABLE
@@ -22,10 +26,6 @@
 
 ANONYMOUS_NAMESPACE_BEGIN
 
-#if defined(_MSC_VER) && !CRYPTOPP_BOOL_SLOW_WORD64
-#include <intrin.h>
-#endif
-
 #if defined(CRYPTOPP_WORD128_AVAILABLE) && !defined(CRYPTOPP_X64_ASM_AVAILABLE)
 using CryptoPP::word128;
 using CryptoPP::word64;
@@ -174,7 +174,7 @@ unsigned int VMAC_Base::OptimalDataAlignment() const
 		GetCipher().OptimalDataAlignment();
 }
 
-#if CRYPTOPP_SSE2_ASM_AVAILABLE && (CRYPTOPP_BOOL_X86)
+#if CRYPTOPP_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86
 #if CRYPTOPP_MSC_VERSION
 # pragma warning(disable: 4731)	// frame pointer register 'ebp' modified by inline assembly code
 #endif
@@ -750,7 +750,7 @@ void VMAC_Base::VHASH_Update_Template(const word64 *data, size_t blocksRemaining
 
 inline void VMAC_Base::VHASH_Update(const word64 *data, size_t blocksRemainingInWord64)
 {
-#if CRYPTOPP_SSE2_ASM_AVAILABLE && (CRYPTOPP_BOOL_X86)
+#if CRYPTOPP_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86
 	if (HasSSE2())
 	{
 		VHASH_Update_SSE2(data, blocksRemainingInWord64, 0);