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 96c1a32ada0f81de6f89173783708424f6ff6adf..c2d1c647d8d01c82498fccfe4c58952fb3b6d6e1 100644 (file)
--- 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>