From 0a13cc9d6e798b0406edca3dbaac33f9f8dedb6b Mon Sep 17 00:00:00 2001 From: Guido Serassio Date: Mon, 1 Jun 2009 21:38:37 +0200 Subject: [PATCH] Windows port: second chunk of fixes needed to build again Squid3 using MinGW --- configure.in | 4 ++-- helpers/external_acl/session/squid_session.c | 7 +++++++ lib/Makefile.am | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index b40af69947..54e3dec4a4 100644 --- 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 2328a66fb2..319225f593 100644 --- 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 #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 #else #include diff --git a/lib/Makefile.am b/lib/Makefile.am index 1b900803e6..98612bb836 100644 --- 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 -- 2.47.3