Windows port: second chunk of fixes needed to build again Squid3 using MinGW

diff --git a/configure.in b/configure.in
index b40af699474189861b00a51944df245369e4c82b..54e3dec4a4cffa9bad0f7a378d0fd7c1b3af7c0e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -257,11 +257,11 @@ dnl set squid required flags
 if test "$GCC" = "yes"; then
 dnl Guido Serassio (serassio@squid-cache.org) 20070811
 dnl Using the latest MinGW (gcc 3.4.5 + mingw-runtime 3.13) cannot build with
-dnl -Wmissing-prototypes -Wmissing-declarations
+dnl -Werror -Wmissing-prototypes -Wmissing-declarations
 dnl TODO: check if the problem will be present in any other newer MinGW release.
     case "$host_os" in
     mingw|mingw32)
-        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wcomments"
        ;;
     *)
         SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"

diff --git a/helpers/external_acl/session/squid_session.c b/helpers/external_acl/session/squid_session.c
index 2328a66fb22a67da6209d903a74c6756de9841eb..319225f59389bf2b79ce5cc171afaff76b662932 100644 (file)
--- a/helpers/external_acl/session/squid_session.c
+++ b/helpers/external_acl/session/squid_session.c
@@ -39,6 +39,13 @@
 #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.
+ */
+#ifndef        __BIT_TYPES_DEFINED__
+#define        __BIT_TYPES_DEFINED__
+#endif
 #include <db.h>
 #else
 #include <db_185.h>

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1b900803e61b4917def5b905e3c61936908473a3..98612bb8361b26b98cac6b6e73d700e2da5f7769 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -99,7 +99,10 @@ libntlmauth_a_SOURCES = \
 libntlmauth_a_LIBADD = \
        @LIBOBJS@
 libsspwin32_a_SOURCES = \
+       base64.c \
        sspwin32.c
+libsspwin32_a_LIBADD = \
+       @LIBOBJS@
 
 
 TESTS += tests/testAll