bk commit into 5.0 tree (konstantin:1.1921)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1921 05/06/06 14:28:00 konstantin@stripped +2 -0
  Fix yaSSL compilation failure on ds20 (DEC CXX + Linux)

  extra/yassl/taocrypt/include/types.hpp
    1.2 05/06/06 14:27:55 konstantin@stripped +2 -0
    Fix yaSSL compilation failure on ds20 (DEC CXX + Linux)

  extra/yassl/taocrypt/include/type_traits.hpp
    1.2 05/06/06 14:27:55 konstantin@stripped +1 -1
    Fix yaSSL compilation failure on ds20 (DEC CXX + Linux)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root

--- 1.1/extra/yassl/taocrypt/include/type_traits.hpp	2005-05-31 19:56:26 +04:00
+++ 1.2/extra/yassl/taocrypt/include/type_traits.hpp	2005-06-06 14:27:55 +04:00
@@ -67,7 +67,7 @@
 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
 

--- 1.1/extra/yassl/taocrypt/include/types.hpp	2005-05-31 19:56:27 +04:00
+++ 1.2/extra/yassl/taocrypt/include/types.hpp	2005-06-06 14:27:55 +04:00
@@ -45,10 +45,12 @@
 
 #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)