From 58d9f812c149943cc18bd5b926b22fcc7b9b8b27 Mon Sep 17 00:00:00 2001
From: weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>
Date: Fri, 25 Jul 2003 00:15:52 +0000
Subject: fix bugs in 64-bit CPU support

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@112 57ff6487-cd31-0410-9ec3-f628ee90f5f0
---
 validat1.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'validat1.cpp')

diff --git a/validat1.cpp b/validat1.cpp
index 1342de5..6c0aee3 100644
--- a/validat1.cpp
+++ b/validat1.cpp
@@ -188,7 +188,7 @@ bool TestSettings()
 		pass = false;
 	}
 	cout << "sizeof(word64) == " << sizeof(word64) << endl;
-#else
+#elif CRYPTOPP_NATIVE_DWORD_AVAILABLE
 	if (sizeof(dword) >= 8)
 	{
 		cout << "FAILED:  sizeof(dword) >= 8, but WORD64_AVAILABLE not defined" << endl;
@@ -198,6 +198,7 @@ bool TestSettings()
 		cout << "passed:  word64 not available" << endl;
 #endif
 
+#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
 	if (sizeof(dword) == 2*sizeof(word))
 		cout << "passed:  ";
 	else
@@ -206,16 +207,7 @@ bool TestSettings()
 		pass = false;
 	}
 	cout << "sizeof(word) == " << sizeof(word) << ", sizeof(dword) == " << sizeof(dword) << endl;
-
-	dword test = (dword(1)<<WORD_BITS) + 2;
-	if (HIGH_WORD(test) == 1 && LOW_WORD(test) == 2)
-		cout << "passed:  ";
-	else
-	{
-		cout << "FAILED:  ";
-		pass = false;
-	}
-	cout << "HIGH_WORD() and LOW_WORD() macros\n";
+#endif
 
 	if (!pass)
 	{
-- 
cgit v1.2.1