1.2.1 stable

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 0 deletions

diff --git a/st.c b/st.c
index ada4fa1489..13f6558111 100644
--- a/st.c
+++ b/st.c
@@ -41,7 +41,10 @@ void *xcalloc();
 void *xrealloc();
 static void rehash();
 
+#ifndef max
 #define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
 #define alloc(type) (type*)xmalloc((unsigned)sizeof(type))
 #define Calloc(n,s) (char*)xcalloc((n),(s))