From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 27 Aug 2009 15:51:38 +0000 (+0200)
Subject: Allow COSS to be built in trunk, but with a configure time warning until ready
X-Git-Tag: SQUID_3_2_0_1~758
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63d3a8b0c9ea9fc4bb67b4a2e990a012d09fac5f;p=thirdparty%2Fsquid.git

Allow COSS to be built in trunk, but with a configure time warning until ready
---

diff --git a/configure.in b/configure.in
index 1fbd66d2af..2bd0d901bf 100644
--- a/configure.in
+++ b/configure.in
@@ -473,6 +473,12 @@ if test -n "$STORE_MODULES"; then
 	    AC_MSG_ERROR(storeio $module does not exist)
 	fi
     done
+    for module in $STORE_MODULES_FULL; do
+	if test "$module" = "coss"; then
+	    echo "WARNING: COSS Support is not stable yet in Squid-3. Please do not use."
+	    sleep 10;
+	fi
+    done
     AC_MSG_NOTICE([Store modules built: $STORE_MODULES])
 fi
 dnl remove all but diskd - its the only module that needs to recurse
diff --git a/src/fs/coss/StoreFScoss.cc b/src/fs/coss/StoreFScoss.cc
index 9b013a81fd..fed69cb180 100644
--- a/src/fs/coss/StoreFScoss.cc
+++ b/src/fs/coss/StoreFScoss.cc
@@ -1,4 +1,3 @@
-#error COSS Support is not stable yet in Squid-3. Please do not use.
 /*
  * $Id$
  *
diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc
index 615b993f5c..0be41406c8 100644
--- a/src/fs/coss/store_dir_coss.cc
+++ b/src/fs/coss/store_dir_coss.cc
@@ -1,4 +1,3 @@
-#error COSS Support is not stable yet in Squid-3. Please do not use.
 /*
  * $Id$
  * vim: set et :
@@ -49,6 +48,7 @@
 #include "ConfigOption.h"
 #include "StoreFScoss.h"
 #include "Parsing.h"
+#include "swap_log_op.h"
 
 #define STORE_META_BUFSZ 4096