Author: Vincent Regnard + Peter Pramberger + Amos Jeffries

Bug 2699: Build failure NTLM smb_lm helper

Multiple definition of int16 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 f7587e7f7e4c6ee2c98b7c6b80fc7036ea77fa87..fdd7dbfaabc05c04dc56e383214a6add0079ad39 100644 (file)
--- 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 7fcde49ae79b09869d0f3e9cc5dab53e05d7b6ff..03ebf74f66fab86b142d9b0094d335b98b6d0343 100644 (file)
--- 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 */