From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 7 Jun 2009 12:08:38 +0000 (+1200)
Subject: Author: Guido Serassio <serassio@squid-cache.org>
X-Git-Tag: SQUID_3_0_STABLE16~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93f6757080e7113b31acece6301a84b1815028b2;p=thirdparty%2Fsquid.git

Author: Guido Serassio <serassio@squid-cache.org>
Windows port: Bit types protection must applied always
---

diff --git a/helpers/external_acl/session/squid_session.c b/helpers/external_acl/session/squid_session.c
index 96c1a32ada..c2d1c647d8 100644
--- a/helpers/external_acl/session/squid_session.c
+++ b/helpers/external_acl/session/squid_session.c
@@ -36,9 +36,6 @@
 #include <getopt.h>
 #endif
 
-#if defined(HAVE_DB_185_H)
-#include <db_185.h>
-#elif defined(HAVE_DB_H)
 /* At this point all Bit Types are already defined, so we must 
    protect from multiple type definition on platform where
    __BIT_TYPES_DEFINED__ is not defined.
@@ -46,6 +43,9 @@
 #ifndef        __BIT_TYPES_DEFINED__
 #define        __BIT_TYPES_DEFINED__
 #endif
+#if defined(HAVE_DB_185_H)
+#include <db_185.h>
+#elif defined(HAVE_DB_H)
 #include <db.h>
 #else
 #include <db_185.h>