Renamed config define FORW_VIA_DB to standard USE_FORW_VIA_DB

diff --git a/configure.in b/configure.in
index aace49c3557c72b7305b34583bde9626c7f9f625..5dbe9e3fa964fd6319da83453ab1ffc0fe7e74b5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1153,7 +1153,7 @@ AC_ARG_ENABLE(forw-via-db,
   AS_HELP_STRING([--enable-forw-via-db],[Enable Forw/Via database]), [
   SQUID_YESNO([$enableval],[unrecognized argument to --enable-forw-via-db: $enableval])
 ])
-SQUID_DEFINE_BOOL(FORW_VIA_DB,${enable_forw_via_db:=no},
+SQUID_DEFINE_BOOL(USE_FORW_VIA_DB,${enable_forw_via_db:=no},
                       [Enable Forw/Via database])
 AC_MSG_NOTICE([Forw/Via database enabled: $enable_forw_via_db])
 

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index caf92ec9cd08139c218b12b744d1be65e1705081..b2a3d27a8577bb9b46f7c3903f1f4e08b74f16cd 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -937,7 +937,7 @@ clientInterpretRequestHeaders(ClientHttpRequest * http)
             request->flags.loopdetect = 1;
         }
 
-#if FORW_VIA_DB
+#if USE_FORW_VIA_DB
         fvdbCountVia(s.termedBuf());
 
 #endif
@@ -960,7 +960,7 @@ clientInterpretRequestHeaders(ClientHttpRequest * http)
         logReferer(fqdnFromAddr(http->getConn()->log_addr), str, http->log_uri);
 
 #endif
-#if FORW_VIA_DB
+#if USE_FORW_VIA_DB
 
     if (req_hdr->has(HDR_X_FORWARDED_FOR)) {
         String s = req_hdr->getList(HDR_X_FORWARDED_FOR);

diff --git a/src/log/access_log.cc b/src/log/access_log.cc
index eec2b5912be2892d4132f0cb232921a14795d612..85afb207091a73905f578b439c196962d6b2a7e9 100644 (file)
--- a/src/log/access_log.cc
+++ b/src/log/access_log.cc
@@ -94,7 +94,7 @@ const char *log_tags[] = {
     "LOG_TYPE_MAX"
 };
 
-#if FORW_VIA_DB
+#if USE_FORW_VIA_DB
 
 typedef struct {
     hash_link hash;
@@ -2037,7 +2037,7 @@ void
 accessLogRotate(void)
 {
     customlog *log;
-#if FORW_VIA_DB
+#if USE_FORW_VIA_DB
 
     fvdbClear();
 #endif
@@ -2114,7 +2114,7 @@ hierarchyNote(HierarchyLogEntry * hl,
 static void
 accessLogRegisterWithCacheManager(void)
 {
-#if FORW_VIA_DB
+#if USE_FORW_VIA_DB
     fvdbRegisterWithCacheManager();
 #endif
 }
@@ -2194,7 +2194,7 @@ accessLogInit(void)
     }
 
 #endif
-#if FORW_VIA_DB
+#if USE_FORW_VIA_DB
 
     fvdbInit();
 
@@ -2219,7 +2219,7 @@ accessLogTime(time_t t)
 }
 
 
-#if FORW_VIA_DB
+#if USE_FORW_VIA_DB
 
 static void
 fvdbInit(void)

diff --git a/src/protos.h b/src/protos.h
index d54dc3c4bfe46f455b6cf651f597db5ae565002e..caccb5851a34c93a856df586df3a2841a34b13e2 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -47,7 +47,7 @@
 class HttpRequestMethod;
 
 
-#if FORW_VIA_DB
+#if USE_FORW_VIA_DB
 SQUIDCEXTERN void fvdbCountVia(const char *key);
 SQUIDCEXTERN void fvdbCountForw(const char *key);
 #endif