From: hno <>
Date: Fri, 18 Mar 2005 22:12:36 +0000 (+0000)
Subject: Replace DIRECT by HIER_DIRECT to avoid conflicts with certain
X-Git-Tag: SQUID_3_0_PRE4~844
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46e12f3a0596368e92cb8170cbc52b269da8bd88;p=thirdparty%2Fsquid.git

Replace DIRECT by HIER_DIRECT to avoid conflicts with certain
third-party headers defining DIRECT to something else
---

diff --git a/src/enums.h b/src/enums.h
index e1c35b3a1f..bf4819e794 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.241 2005/03/06 14:46:29 serassio Exp $
+ * $Id: enums.h,v 1.242 2005/03/18 15:12:36 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -251,7 +251,7 @@ typedef enum {
 
 typedef enum {
     HIER_NONE,
-    DIRECT,
+    HIER_DIRECT,
     SIBLING_HIT,
     PARENT_HIT,
     DEFAULT_PARENT,
diff --git a/src/peer_select.cc b/src/peer_select.cc
index 1c92a2fce9..c36f81c924 100644
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_select.cc,v 1.135 2004/12/20 16:30:36 robertc Exp $
+ * $Id: peer_select.cc,v 1.136 2005/03/18 15:12:36 hno Exp $
  *
  * DEBUG: section 44    Peer Selection Algorithm
  * AUTHOR: Duane Wessels
@@ -495,9 +495,9 @@ peerGetSomeDirect(ps_state * ps)
 
     if (ps->request->protocol == PROTO_WAIS)
         /* Its not really DIRECT, now is it? */
-        peerAddFwdServer(&ps->servers, Config.Wais._peer, DIRECT);
+        peerAddFwdServer(&ps->servers, Config.Wais._peer, HIER_DIRECT);
     else
-        peerAddFwdServer(&ps->servers, NULL, DIRECT);
+        peerAddFwdServer(&ps->servers, NULL, HIER_DIRECT);
 }
 
 static void