diff options
author | unknown <svoj@mysql.com> | 2005-06-15 22:43:44 +0500 |
---|---|---|
committer | unknown <svoj@mysql.com> | 2005-06-15 22:43:44 +0500 |
commit | fc465d1497ce598d07ec75eeaafc7ca84b578ee6 (patch) | |
tree | cb87781caed5fdd88b5ac1d84797faad11346bc2 /extra/yassl/taocrypt/src/misc.cpp | |
parent | 24de70926ea325dafe1c81aa64a6d86ed4ad85c3 (diff) | |
parent | 8419d7472ffc51cdc0aefd6efca92e405f1172cf (diff) | |
download | mariadb-git-fc465d1497ce598d07ec75eeaafc7ca84b578ee6.tar.gz |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
Diffstat (limited to 'extra/yassl/taocrypt/src/misc.cpp')
-rw-r--r-- | extra/yassl/taocrypt/src/misc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/src/misc.cpp b/extra/yassl/taocrypt/src/misc.cpp index 6d43273ef20..3ec4502ed57 100644 --- a/extra/yassl/taocrypt/src/misc.cpp +++ b/extra/yassl/taocrypt/src/misc.cpp @@ -136,7 +136,7 @@ unsigned long Crop(unsigned long value, unsigned int size) #if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && \ - !(defined(__HP_aCC) && (__HP_aCC <= 35700)) + !(defined(__HP_aCC) && (__HP_aCC <= 36300)) using std::new_handler; using std::set_new_handler; #endif |