From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 23 Jul 2009 12:36:53 +0000 (+1200)
Subject: Fix NCSA auth helper include sequence and wrapping
X-Git-Tag: SQUID_3_1_0_12~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4f9ab411d35c1c57624b253c119078f4b3a9105;p=thirdparty%2Fsquid.git

Fix NCSA auth helper include sequence and wrapping
---

diff --git a/helpers/basic_auth/NCSA/crypt_md5.c b/helpers/basic_auth/NCSA/crypt_md5.c
index d366e6f446..a80ef33677 100644
--- a/helpers/basic_auth/NCSA/crypt_md5.c
+++ b/helpers/basic_auth/NCSA/crypt_md5.c
@@ -14,12 +14,16 @@
  * Origin: Id: crypt.c,v 1.3 1995/05/30 05:42:22 rgrimes Exp
  *
  */
+#include "config.h"
 
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+#if HAVE_STDIO_H
 #include <stdio.h>
-#include "config.h"
-#include "md5.h"
+#endif
 
+#include "md5.h"
 #include "crypt_md5.h"
 
 static unsigned char itoa64[] =	/* 0 ... 63 => ascii - 64 */
diff --git a/helpers/basic_auth/NCSA/ncsa_auth.c b/helpers/basic_auth/NCSA/ncsa_auth.c
index 3048f4c219..12aa83f237 100644
--- a/helpers/basic_auth/NCSA/ncsa_auth.c
+++ b/helpers/basic_auth/NCSA/ncsa_auth.c
@@ -18,6 +18,7 @@
  */
 
 #include "config.h"
+
 #if HAVE_STDIO_H
 #include <stdio.h>
 #endif