summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2007-02-24 04:22:34 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2007-02-24 04:22:34 +0200
commit3c9904123b6e2a07dff025f5e92c82d18afdad58 (patch)
tree19221b394db54a73f75d403d03edca4ea37ff5b3 /extra
parent338cb6a83644debcb4fae9a8bdd8880294b30383 (diff)
downloadmariadb-git-3c9904123b6e2a07dff025f5e92c82d18afdad58.tar.gz
Fixed windows compilation problems
extra/yassl/taocrypt/mySTL/algorithm.hpp: max is defined on windows sql/sql_list.h: Fixed compiler warning on windows
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/taocrypt/mySTL/algorithm.hpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/extra/yassl/taocrypt/mySTL/algorithm.hpp b/extra/yassl/taocrypt/mySTL/algorithm.hpp
index d8bc29a0bb9..f6a29cf4bdb 100644
--- a/extra/yassl/taocrypt/mySTL/algorithm.hpp
+++ b/extra/yassl/taocrypt/mySTL/algorithm.hpp
@@ -27,6 +27,8 @@
namespace mySTL {
+#undef max
+#undef min
template<typename T>
inline const T& max(const T& a, const T&b)