From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 20 Mar 2008 13:01:28 +0000 (+0100)
Subject: Bug #2275: 3.0 compile failure "ProtoPort.h" missing.
X-Git-Tag: SQUID_3_0_STABLE3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef3f9a7c0f763553149034afa29e1dba4b94b3c1;p=thirdparty%2Fsquid.git

Bug #2275: 3.0 compile failure "ProtoPort.h" missing.

ProtoPort.h is only meant to be in 3.HEAD (what will become 3.1).

Resolved merge conflict in backport of bug #2252 Build failure on Mac OSX 10.5.
(rev #8723)
---

diff --git a/src/ACLMyPortName.cc b/src/ACLMyPortName.cc
index 1ec95e0a11..249545b85a 100644
--- a/src/ACLMyPortName.cc
+++ b/src/ACLMyPortName.cc
@@ -34,7 +34,6 @@
  */
 
 #include "squid.h"
-#include "ProtoPort.h"
 #include "ACLMyPortName.h"
 #include "ACLStringData.h"
 #include "ACLChecklist.h"