From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 13 Mar 2009 21:44:10 +0000 (-0600)
Subject: Do not redefine max(). compat/compat_shared.h:135 is the location of the
X-Git-Tag: SQUID_3_2_0_1~1121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bd8e8d40325b7bd4ffaf09a4ec4c5f9e31fa9f1;p=thirdparty%2Fsquid.git

Do not redefine max(). compat/compat_shared.h:135 is the location of the
previous definition.

Made max() #define safer. Do we really need it?
---

diff --git a/helpers/ntlm_auth/smb_lm/smbval/smblib-priv.h b/helpers/ntlm_auth/smb_lm/smbval/smblib-priv.h
index afdbebe32b..93dce361c2 100644
--- a/helpers/ntlm_auth/smb_lm/smbval/smblib-priv.h
+++ b/helpers/ntlm_auth/smb_lm/smbval/smblib-priv.h
@@ -32,7 +32,9 @@
 
 #include "byteorder.h"		/* Hmmm ... hot good */
 
-#define max(a,b) (a < b ? b : a)
+#ifndef max
+#define max(a,b) ((a) < (b) ? (b) : (a))
+#endif
 
 #define SMB_DEF_IDF 0x424D53FF	/* "\377SMB" */