From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 4 May 2010 08:59:34 +0000 (+1200)
Subject: Author: Matthias "Silamael" <Silamael@coronamundi.de>
X-Git-Tag: SQUID_3_1_4~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b77eab77540796d1528d9edd270bc666ef8a9886;p=thirdparty%2Fsquid.git

Author: Matthias "Silamael" <Silamael@coronamundi.de>
OpenBSD 4.6 build error: FD_SETSIZE redefined
---

diff --git a/helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c b/helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c
index 50a6ce870d..236b17b7ef 100644
--- a/helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c
+++ b/helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c
@@ -23,12 +23,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <string.h>
-#include <stdlib.h>
+#include "config.h"
 
 #include "std-includes.h"
 #include "rfcnb-priv.h"
 #include "rfcnb-util.h"
+#include <string.h>
+#include <stdlib.h>
 #include "rfcnb-io.h"
 #include <arpa/inet.h>
 
diff --git a/helpers/ntlm_auth/smb_lm/smbval/session.c b/helpers/ntlm_auth/smb_lm/smbval/session.c
index 65776a3602..cb4f6848c8 100644
--- a/helpers/ntlm_auth/smb_lm/smbval/session.c
+++ b/helpers/ntlm_auth/smb_lm/smbval/session.c
@@ -23,8 +23,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <string.h>
-#include <stdlib.h>
+#include "config.h"
 
 int RFCNB_errno = 0;
 int RFCNB_saved_errno = 0;
@@ -34,6 +33,8 @@ int RFCNB_saved_errno = 0;
 #include <netinet/tcp.h>
 #include "rfcnb-priv.h"
 #include "rfcnb-util.h"
+#include <string.h>
+#include <stdlib.h>
 #include "rfcnb-io.h"
 #include "rfcnb.h"