Fix yaSSL compilation failure on ds20 (DEC CXX + Linux)

b2426910 · konstantin@mysql.com · c956ed54 · b2426910 · b2426910
Commit b2426910 authored Jun 06, 2005 by konstantin@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

extra/yassl/taocrypt/include/type_traits.hpp extra/yassl/taocrypt/include/type_traits.hpp +1 -1

extra/yassl/taocrypt/include/types.hpp extra/yassl/taocrypt/include/types.hpp +2 -0

No files found.
--- a/extra/yassl/taocrypt/include/type_traits.hpp
+++ b/extra/yassl/taocrypt/include/type_traits.hpp
@@ -67,7 +67,7 @@ MK_FUNDAMENTAL_TYPE(float)
 MK_FUNDAMENTAL_TYPE(     double)
 MK_FUNDAMENTAL_TYPE(long double)
-#ifdef WORD64_AVAILABLE
+#if defined(WORD64_AVAILABLE) && defined(WORD64_IS_DISTINCT_TYPE)
    MK_FUNDAMENTAL_TYPE(word64)
 #endif

--- a/extra/yassl/taocrypt/include/types.hpp
+++ b/extra/yassl/taocrypt/include/types.hpp
@@ -45,10 +45,12 @@ typedef unsigned int   word32;
 #if defined(__GNUC__) || defined(__MWERKS__) || defined(_LONGLONG_TYPE)
    #define WORD64_AVAILABLE
+    #define WORD64_IS_DISTINCT_TYPE
    typedef unsigned long long word64;
    #define W64LIT(x) x##LL
 #elif defined(_MSC_VER) || defined(__BCPLUSPLUS__)
    #define WORD64_AVAILABLE
+    #define WORD64_IS_DISTINCT_TYPE
    typedef unsigned __int64 word64;
    #define W64LIT(x) x##ui64
 #elif defined(__DECCXX)