DW:

 - If we're going to remove some #if USE_UNLINKD statements, we might as
   well remove all of them so Squid compiles.

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index bb5d25e4752945149da0cc3d0c2fccf2108f8bce..173ab679932db0f73bcacf42c5dd6c021eb0bca9 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.347 2000/05/31 01:04:49 hno Exp $
+ * $Id: cache_cf.cc,v 1.348 2000/05/31 05:02:11 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -360,9 +360,7 @@ configDoConfigure(void)
 #if USE_DNSSERVERS
     requirePathnameExists("cache_dns_program", Config.Program.dnsserver);
 #endif
-#if USE_UNLINKD
     requirePathnameExists("unlinkd_program", Config.Program.unlinkd);
-#endif
     if (Config.Program.redirect)
        requirePathnameExists("redirect_program", Config.Program.redirect->key);
     if (Config.Program.authenticate)

diff --git a/src/cf.data.pre b/src/cf.data.pre
index e17af3becc2c55cb7df97feeed64d20c334b0dec..b89a7a795bc58346e4605da4e137b4457f483267 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.185 2000/05/31 01:04:49 hno Exp $
+# $Id: cf.data.pre,v 1.186 2000/05/31 05:04:04 wessels Exp $
 #
 #
 # SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -944,7 +944,6 @@ DOC_END
 
 
 NAME: unlinkd_program
-IFDEF: USE_UNLINKD
 TYPE: string
 DEFAULT: @DEFAULT_UNLINKD@
 LOC: Config.Program.unlinkd

diff --git a/src/main.cc b/src/main.cc
index eab64b43d3d75393562d3bd2079becb045aac744..600cdc352156b0dbc629213319df2d2fa62d8e7d 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.311 2000/05/31 01:04:49 hno Exp $
+ * $Id: main.cc,v 1.312 2000/05/31 05:02:11 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -494,9 +494,7 @@ mainInitialize(void)
 #endif
 
     if (!configured_once) {
-#if USE_UNLINKD
        unlinkdInit();
-#endif
        urlInitialize();
        cachemgrInit();
        statInit();
@@ -907,9 +905,7 @@ SquidShutdown(void *unused)
 #endif
     releaseServerSockets();
     commCloseAllSockets();
-#if USE_UNLINKD
     unlinkdClose();
-#endif
     storeDirSync();            /* Flush pending object writes/unlinks */
     storeDirWriteCleanLogs(0);
     PrintRusage();

diff --git a/src/protos.h b/src/protos.h
index 859455d55ae9752764690cfec24174402a56f290..de62925e4e157785edcdf10eafbcee2a005da297 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.367 2000/05/31 01:04:50 hno Exp $
+ * $Id: protos.h,v 1.368 2000/05/31 05:02:11 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -1012,11 +1012,9 @@ extern void pumpStart(int, FwdState *, CWCB * callback, void *);
 extern int pumpMethod(method_t method);
 extern int pumpRestart(request_t *);
 
-#if USE_UNLINKD
 extern void unlinkdInit(void);
 extern void unlinkdClose(void);
 extern void unlinkdUnlink(const char *);
-#endif
 
 extern char *url_convert_hex(char *org_url, int allocate);
 extern char *url_escape(const char *url);

diff --git a/src/structs.h b/src/structs.h
index f42cce11e25092349e9926e9e9e0b2403949cb10..596e4193c9326928d311b32eb75946139130e46d 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.336 2000/05/31 01:04:50 hno Exp $
+ * $Id: structs.h,v 1.337 2000/05/31 05:02:12 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -312,9 +312,7 @@ struct _SquidConfig {
 #if USE_ICMP
        char *pinger;
 #endif
-#if USE_UNLINKD
        char *unlinkd;
-#endif
     } Program;
 #if USE_DNSSERVERS
     int dnsChildren;