From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sun, 3 Jan 2010 21:18:34 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_2_0_1~310^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d2c3522b2a53d123f545c3c178e0c7ed0d7cc40;p=thirdparty%2Fsquid.git

Merged from trunk
---

9d2c3522b2a53d123f545c3c178e0c7ed0d7cc40
diff --cc helpers/basic_auth/SASL/basic_sasl_auth.cc
index f45f7849ef,620a1554a2..51dc6df7cf
--- a/helpers/basic_auth/SASL/basic_sasl_auth.cc
+++ b/helpers/basic_auth/SASL/basic_sasl_auth.cc
@@@ -26,15 -26,23 +26,23 @@@
   *             or with SASL2: gcc -Wall -o sasl_auth sasl_auth.c -lsasl2
   *
   */
+ #include "config.h"
+ #include "rfc1738.h"
+ #include "util.h"
+ 
+ #if HAVE_STDIO_H
  #include <stdio.h>
+ #endif
+ #if HAVE_ERRNO_H
  #include <errno.h>
+ #endif
+ #if HAVE_STDLIB_H
  #include <stdlib.h>
+ #endif
+ #if HAVE_STRING_H
  #include <string.h>
- 
- #include "rfc1738.h"
- #include "util.h"
- 
+ #endif
 -#ifdef HAVE_SASL_SASL_H
 +#if HAVE_SASL_SASL_H
  #include <sasl/sasl.h>
  #else
  #include <sasl.h>