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 afdbebe32b21908f6f810c4f8ca9447cb3870367..93dce361c22ab25546cbc8ef0a241aa97a2ce092 100644 (file)
--- 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" */