From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 8 Mar 2009 13:22:37 +0000 (+0100)
Subject: Wrap #define max in an #ifndef to avoid conflict with squid compat.h
X-Git-Tag: SQUID_3_2_0_1~1130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e68ea0113b2e5473b3395815c55f8bf3a95b857;p=thirdparty%2Fsquid.git

Wrap #define max in an #ifndef to avoid conflict with squid compat.h
---

diff --git a/helpers/basic_auth/MSNT/smblib-priv.h b/helpers/basic_auth/MSNT/smblib-priv.h
index aad6ffb2b4..859b6b9253 100644
--- a/helpers/basic_auth/MSNT/smblib-priv.h
+++ b/helpers/basic_auth/MSNT/smblib-priv.h
@@ -33,7 +33,9 @@
 
 #include "byteorder.h"		/* Hmmm ... hot good */
 
+#ifndef max
 #define max(a,b) (a < b ? b : a)
+#endif
 
 #define SMB_DEF_IDF 0x424D53FF	/* "\377SMB" */