From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 30 Jun 2009 00:35:28 +0000 (+1200)
Subject: Author: Vincent Régnard + Peter Pramberger + Amos Jeffries
X-Git-Tag: SQUID_3_2_0_1~918
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b297757d0cb4e04e3b2e53e97388004269cfbde;p=thirdparty%2Fsquid.git

Author: Vincent Régnard + Peter Pramberger + Amos Jeffries
Bug 2699: Build failure NTLM smb_lm helper

Multiple definition of uint16 in included headers.
Make the typedef in .c and as portable as possible.
---

diff --git a/helpers/ntlm_auth/smb_lm/smbval/rfcnb-priv.h b/helpers/ntlm_auth/smb_lm/smbval/rfcnb-priv.h
index f7587e7f7e..fdd7dbfaab 100644
--- a/helpers/ntlm_auth/smb_lm/smbval/rfcnb-priv.h
+++ b/helpers/ntlm_auth/smb_lm/smbval/rfcnb-priv.h
@@ -28,8 +28,6 @@
 
 /* Defines we need */
 
-typedef unsigned short uint16;
-
 #define GLOBAL extern
 
 #include "rfcnb-error.h"
diff --git a/helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c b/helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c
index 7fcde49ae7..03ebf74f66 100644
--- a/helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c
+++ b/helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c
@@ -32,6 +32,13 @@
 #include "rfcnb-io.h"
 #include <arpa/inet.h>
 
+#ifndef uint16
+#ifdef u_int16_t
+typedef u_int16_t uint16;
+#else
+typedef unsigned short uint16;
+#endif
+#endif
 
 extern void (*Prot_Print_Routine) ();	/* Pointer to protocol print routine */